diff options
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 37cdd41ee55..75e3b514531 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -1,4 +1,4 @@ -;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts +;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*- ;; Copyright (C) 1999-2011 Free Software Foundation, Inc. |