Mercurial > emacs

diff lisp/smerge-mode.el @ 88123:375f2633d815

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New directory
author Kenichi Handa <handa@m17n.org>
date Mon, 08 Sep 2003 11:56:09 +0000
parents 695cf19ef79e
children 68c22ea6027c
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Thu Sep 04 04:00:49 2003 +0000
+++ b/lisp/smerge-mode.el	Mon Sep 08 11:56:09 2003 +0000
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.21 2003/02/04 12:05:02 lektu Exp $
+;; Revision: $Id: smerge-mode.el,v 1.20 2002/10/10 17:30:20 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -535,6 +535,4 @@
 
 
 (provide 'smerge-mode)
-
-;;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
 ;;; smerge-mode.el ends here