diff options
| -rw-r--r-- | lisp/emerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index e161364ee58..f842ce6f3ac 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -268,7 +268,7 @@ Do not start with `~/' or `~user-name/'.") "*Mode for Emerge temporary files.") (defvar emerge-combine-versions-template - "#ifdef NEW\n%b#else /* NEW */\n%a#endif /* NEW */\n" + "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n" "*Template for `emerge-combine-versions' to combine the two versions. The template is inserted as a string, with the following interpolations: %a the A version of the difference |