diff options
author | Glenn Morris <rgm@gnu.org> | 2011-02-02 23:09:50 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2011-02-02 23:09:50 -0800 |
commit | f6041baa9d84125b0af4939b2d05edc0c59f034a (patch) | |
tree | e5edd5191c78a130b0688377cb86fbd9c5c56ce6 /lisp/emacs-lisp/lisp-mnt.el | |
parent | fd7ec1ba35a61bd68d82704e9fe4c6b60513f83f (diff) | |
download | emacs-f6041baa9d84125b0af4939b2d05edc0c59f034a.tar.gz emacs-f6041baa9d84125b0af4939b2d05edc0c59f034a.tar.bz2 emacs-f6041baa9d84125b0af4939b2d05edc0c59f034a.zip |
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-buffer): New constant.
(bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it.
(bzrmerge-missing): If nothing to do, return nil not (nil).
(bzrmerge-apply): Remove odd character from message.
(bzrmerge): Give status messages.
Diffstat (limited to 'lisp/emacs-lisp/lisp-mnt.el')
0 files changed, 0 insertions, 0 deletions