HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
New directory
[bpt/emacs.git]
/
lisp
/
ediff-merg.el
diff --git
a/lisp/ediff-merg.el
b/lisp/ediff-merg.el
index
237ce51
..
e7f6de3
100644
(file)
--- a/
lisp/ediff-merg.el
+++ b/
lisp/ediff-merg.el
@@
-388,5
+388,4
@@
Combining is done according to the specifications in variable
;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;;; End:
-;;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb
;;; ediff-merg.el ends here