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

From: Romain Francoise
Subject: [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el
Date: Wed, 26 Oct 2005 04:38:09 -0400 
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.45 emacs/lisp/smerge-mode.el:1.46
*** emacs/lisp/smerge-mode.el:1.45      Fri Sep 23 18:15:20 2005
--- emacs/lisp/smerge-mode.el   Wed Oct 26 08:38:07 2005
***************
*** 4,10 ****
  ;;   2004, 2005 Free Software Foundation, Inc.
  
  ;; Author: Stefan Monnier <address@hidden>
! ;; Keywords: revision-control merge diff3 cvs conflict
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  ;;   2004, 2005 Free Software Foundation, Inc.
  
  ;; Author: Stefan Monnier <address@hidden>
! ;; Keywords: tools revision-control merge diff3 cvs conflict
  
  ;; This file is part of GNU Emacs.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]