summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-02-05 20:23:59 -0800
committerDan Nicolaescu <dann@ics.uci.edu>2010-02-05 20:23:59 -0800
commit4775ecad67ce740d6e258ac488a025d488295d33 (patch)
tree800b4cea2848c9c3031de865075ef3a88ad40e4e /lisp/emacs-lisp/lisp.el
parent0d17c4b9879f92d557151d812e19923f397d51ec (diff)
downloademacs-4775ecad67ce740d6e258ac488a025d488295d33.tar.gz
emacs-4775ecad67ce740d6e258ac488a025d488295d33.tar.bz2
emacs-4775ecad67ce740d6e258ac488a025d488295d33.zip
* vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
0 files changed, 0 insertions, 0 deletions