diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-15 15:16:57 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-15 15:16:57 -0800 |
| commit | 0d9f702fd085bc8ad560a3e1f08d5e93054a5d33 (patch) | |
| tree | 8f7f07c160e5878c775fc6c2bb5ec912a164448e /lisp/vc/ediff-merg.el | |
| parent | 2153c86209ef95a34f3a80f7a1f72d5fade18c21 (diff) | |
| download | emacs-0d9f702fd085bc8ad560a3e1f08d5e93054a5d33.tar.gz | |
Nuke arch-tags.
Diffstat (limited to 'lisp/vc/ediff-merg.el')
| -rw-r--r-- | lisp/vc/ediff-merg.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index b63bd15f4ea..247d6caa62c 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el @@ -394,5 +394,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 |