summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2003-09-01 15:45:59 +0000
committerMiles Bader <miles@gnu.org>2003-09-01 15:45:59 +0000
commitab5796a9f97180707734a81320e3eb81937281fe (patch)
treeeef8aa4dd3733966628c6a43bd924b51557519e9 /lisp/ediff-merg.el
parent1042fe8c8ca167fdb44365d99a35492df87b078f (diff)
downloademacs-ab5796a9f97180707734a81320e3eb81937281fe.tar.gz
Add arch taglines
Diffstat (limited to 'lisp/ediff-merg.el')
-rw-r--r--lisp/ediff-merg.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index e7f6de3e861..237ce514cbb 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -388,4 +388,5 @@ 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