diff options
| author | Miles Bader <miles@gnu.org> | 2003-09-01 15:45:59 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2003-09-01 15:45:59 +0000 |
| commit | f51da7d2c516235d43796493c0db69a183cc6220 (patch) | |
| tree | 118b3f08b772b016b051c77c0f35d95f0fdfe7e9 /lisp/smerge-mode.el | |
| parent | 6a01dc46781e69a381d0336cadefd31f7ca0b64b (diff) | |
| download | emacs-f51da7d2c516235d43796493c0db69a183cc6220.tar.gz | |
Add arch taglines
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 108eff07759..b43303a65b4 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.20 2002/10/10 17:30:20 monnier Exp $ +;; Revision: $Id: smerge-mode.el,v 1.21 2003/02/04 12:05:02 lektu Exp $ ;; This file is part of GNU Emacs. @@ -535,4 +535,6 @@ buffer names." (provide 'smerge-mode) + +;;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690 ;;; smerge-mode.el ends here |