[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el [lexbind] |
Date: |
Tue, 14 Oct 2003 19:52:22 -0400 |
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.15.4.1 emacs/lisp/smerge-mode.el:1.15.4.2
*** emacs/lisp/smerge-mode.el:1.15.4.1 Fri Apr 4 01:20:11 2003
--- emacs/lisp/smerge-mode.el Tue Oct 14 19:51:24 2003
***************
*** 4,10 ****
;; Author: Stefan Monnier <address@hidden>
;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.15.4.1 2003/04/04 06:20:11 miles Exp $
;; This file is part of GNU Emacs.
--- 4,10 ----
;; Author: Stefan Monnier <address@hidden>
;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.15.4.2 2003/10/14 23:51:24 miles Exp $
;; This file is part of GNU Emacs.
***************
*** 535,538 ****
--- 535,540 ----
(provide 'smerge-mode)
+
+ ;;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
;;; smerge-mode.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el [lexbind],
Miles Bader <=