summaryrefslogtreecommitdiff
path: root/lisp/vc/smerge-mode.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-06-10 20:41:02 -0700
committerGlenn Morris <rgm@gnu.org>2010-06-10 20:41:02 -0700
commitb7adf504c082723cf547475d352c26d8f4c4149c (patch)
tree40d1e676a316f512027d3e618b2280a768a0288f /lisp/vc/smerge-mode.el
parent338648ad799881124b517183ebbe0984b0656d92 (diff)
downloademacs-b7adf504c082723cf547475d352c26d8f4c4149c.tar.gz
emacs-b7adf504c082723cf547475d352c26d8f4c4149c.tar.bz2
emacs-b7adf504c082723cf547475d352c26d8f4c4149c.zip
* INSTALL: Revert previous accidental commit.
Diffstat (limited to 'lisp/vc/smerge-mode.el')
0 files changed, 0 insertions, 0 deletions