summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/disass.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-01-06 07:11:52 -0800
committerDan Nicolaescu <dann@ics.uci.edu>2010-01-06 07:11:52 -0800
commit7534fa5ed2ebbab8efee55bbacf0ba57f754ff6e (patch)
treec2d13de50f38649dc6552e237621b48e181aae97 /lisp/emacs-lisp/disass.el
parent8a9082249c14f2cdac3d534502c3f66cc8804195 (diff)
downloademacs-7534fa5ed2ebbab8efee55bbacf0ba57f754ff6e.tar.gz
emacs-7534fa5ed2ebbab8efee55bbacf0ba57f754ff6e.tar.bz2
emacs-7534fa5ed2ebbab8efee55bbacf0ba57f754ff6e.zip
(vc-bzr-after-dir-status): Ignore pending merges.
Diffstat (limited to 'lisp/emacs-lisp/disass.el')
0 files changed, 0 insertions, 0 deletions