diff options
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 47663a59c97..4c68293cf40 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: merge diff3 cvs conflict | 6 | ;; Keywords: merge diff3 cvs conflict |
| 7 | ;; Revision: $Id: smerge-mode.el,v 1.17 2002/09/03 01:20:20 monnier Exp $ | 7 | ;; Revision: $Id: smerge-mode.el,v 1.18 2002/10/04 15:25:22 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -417,6 +417,7 @@ The point is moved to the end of the conflict." | |||
| 417 | (defvar ediff-buffer-B) | 417 | (defvar ediff-buffer-B) |
| 418 | (defvar ediff-buffer-C) | 418 | (defvar ediff-buffer-C) |
| 419 | 419 | ||
| 420 | ;;;###autoload | ||
| 420 | (defun smerge-ediff (&optional name-mine name-other name-base) | 421 | (defun smerge-ediff (&optional name-mine name-other name-base) |
| 421 | "Invoke ediff to resolve the conflicts. | 422 | "Invoke ediff to resolve the conflicts. |
| 422 | NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the | 423 | NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the |