summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-01-31 20:58:35 -0800
committerDan Nicolaescu <dann@ics.uci.edu>2010-01-31 20:58:35 -0800
commit7a444e2a993a26daeb15364e8ccff3ba31b3525e (patch)
tree281d007dd9e12fe853c625b636a5a32f90090fa0 /lisp/emacs-lisp
parentad6fc8f44ebb3a48ecb3800273bbe82219391222 (diff)
downloademacs-7a444e2a993a26daeb15364e8ccff3ba31b3525e.tar.gz
emacs-7a444e2a993a26daeb15364e8ccff3ba31b3525e.tar.bz2
emacs-7a444e2a993a26daeb15364e8ccff3ba31b3525e.zip
(vc-bzr-dir-extra-headers): Add a header when a
pending merge is detected.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions