[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v |
Date: |
Tue, 08 Jan 2008 20:49:07 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/01/08 20:46:54
Index: lisp/smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- lisp/smerge-mode.el 19 Nov 2007 08:50:02 -0000 1.58
+++ lisp/smerge-mode.el 8 Jan 2008 20:44:57 -0000 1.59
@@ -1,7 +1,7 @@
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: tools revision-control merge diff3 cvs conflict
- [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v,
Miles Bader <=