emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el, v [EMACS_22_BASE]


From: Glenn Morris
Subject: [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el, v [EMACS_22_BASE]
Date: Mon, 07 Jan 2008 02:45:50 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       08/01/07 02:45:19

Index: smerge-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.50.2.2
retrieving revision 1.50.2.3
diff -u -b -r1.50.2.2 -r1.50.2.3
--- smerge-mode.el      16 Aug 2007 20:04:35 -0000      1.50.2.2
+++ smerge-mode.el      7 Jan 2008 02:44:15 -0000       1.50.2.3
@@ -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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]