[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el
From: |
Thien-Thi Nguyen |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el |
Date: |
Sat, 06 Aug 2005 18:14:26 -0400 |
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.39 emacs/lisp/smerge-mode.el:1.40
*** emacs/lisp/smerge-mode.el:1.39 Tue Jul 26 16:07:55 2005
--- emacs/lisp/smerge-mode.el Sat Aug 6 22:13:43 2005
***************
*** 1,6 ****
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
! ;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation,
Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: revision-control merge diff3 cvs conflict
--- 1,7 ----
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
! ;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
! ;; 2004, 2005 Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: revision-control merge diff3 cvs conflict
- [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,
Thien-Thi Nguyen <=