summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-merg.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc/ediff-merg.el')
-rw-r--r--lisp/vc/ediff-merg.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 2bdce9e33c7..d0ce9d326d8 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -257,7 +257,8 @@ Buffer B."
(defun ediff-re-merge ()
- "Remerge unmodified diff regions using a new default. Start with the current region."
+ "Remerge unmodified diff regions using a new default.
+Start with the current region."
(interactive)
(let* ((default-variant-alist
(list '("default-A") '("default-B") '("combined")))