diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-09-24 14:46:56 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-09-26 13:23:57 +0200 |
| commit | c78e16962e63895d340f80cf245fad568a7da770 (patch) | |
| tree | fd8912ae6e025f7c20ecce2eea1708e092a5093f /lisp/vc/ediff-merg.el | |
| parent | f4ea15907aeb020b80d021a8d6bf212bcde08ab9 (diff) | |
| download | emacs-c78e16962e63895d340f80cf245fad568a7da770.tar.gz | |
; Adjust overly long docstrings to fit 80 characters
Diffstat (limited to 'lisp/vc/ediff-merg.el')
| -rw-r--r-- | lisp/vc/ediff-merg.el | 3 |
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"))) |