aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2011-02-05 14:46:34 -0800
committerGlenn Morris2011-02-05 14:46:34 -0800
commit4d881c83419fbdbcfc4ba8cc8b0ef88eb9c45ccd (patch)
tree24fb2b255d752532167cb2a0d0bcf58c7b1daf0d /src
parent233ba4d924933cb56129bd7511e6137b7c0b8e3e (diff)
downloademacs-4d881c83419fbdbcfc4ba8cc8b0ef88eb9c45ccd.tar.gz
emacs-4d881c83419fbdbcfc4ba8cc8b0ef88eb9c45ccd.zip
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant. (bzrmerge-apply): Use it. (bzrmerge): Kill any old warning buffer first.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions