From 6b61353c0a0320ee15bb6488149735381fed62ec Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 16 Apr 2004 12:51:06 +0000 Subject: Sync to HEAD --- lisp/ediff-merg.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/ediff-merg.el') 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 -- cgit v1.2.1