Mercurial > emacs

annotate etc/images/gnus/fuwo.pbm @ 111679:33ed3cf8260b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial support for unified DVCS pull and merge. * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars. (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull) (vc-bzr-merge-branch): New functions, implementing merge-branch and pull operations. * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available. Accept optional prefix arg meaning to prompt for a command. (vc-update): Use vc-BACKEND-pull if available. Accept optional prefix arg meaning to prompt for a command. (vc-pull): Alias for vc-update.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 22 Nov 2010 20:15:08 -0500
parents 210af0ad3d35
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
60029
210af0ad3d35 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
Miles Bader <miles@gnu.org>
parents:
diff changeset
1 (binary:image/x-portable-bitmap)