diff options
| author | Stefan Monnier <[email protected]> | 2008-05-12 18:21:24 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2008-05-12 18:21:24 +0000 |
| commit | d5c1493791cad75d488d6364687c3b35e4299fb9 (patch) | |
| tree | 39c40b44646d9b5f0c206111be8c3051fa6a6227 /lisp/smerge-mode.el | |
| parent | 84cb74cf070bd76a81e81f597165d67875fe79a7 (diff) | |
(smerge-apply-resolution-patch): Don't pass nil to `insert'.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 7175ec2c40..6489133e12 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -458,7 +458,7 @@ BUF contains a plain diff between match-1 and match-3." (with-current-buffer textbuf (forward-line (- startline line)) (insert "<<<<<<< " name1 "\n" othertext - (if name2 (concat "||||||| " name2 "\n")) + (if name2 (concat "||||||| " name2 "\n") "") "=======\n") (forward-line lines) (insert ">>>>>>> " name3 "\n") |