Mercurial > emacs
diff lisp/emerge.el @ 14668:a281f3b85f32
(emerge-combine-versions-template): Make the
generated comments on the #else and #endif follow the GNU standards.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 25 Feb 1996 22:53:18 +0000 |
parents | 7669c19beda8 |
children | dd08f1c1f488 |
line wrap: on
line diff
--- a/lisp/emerge.el Sun Feb 25 20:46:59 1996 +0000 +++ b/lisp/emerge.el Sun Feb 25 22:53:18 1996 +0000 @@ -268,7 +268,7 @@ "*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