Mercurial > emacs

changeset 14668:a281f3b85f32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 3de266c52c9a
children 6feeb4e59815
files lisp/emerge.el
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
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