diff options
| author | Kenichi Handa <handa@m17n.org> | 2004-04-16 12:51:06 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2004-04-16 12:51:06 +0000 |
| commit | 6b61353c0a0320ee15bb6488149735381fed62ec (patch) | |
| tree | e69adba60e504a5a37beb556ad70084de88a7aab /lisp/ediff-merg.el | |
| parent | dc6a28319312fe81f7a1015e363174022313f0bd (diff) | |
| download | emacs-6b61353c0a0320ee15bb6488149735381fed62ec.tar.gz | |
Sync to HEAD
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 1 |
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 |