# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 825288798 0
# Node ID a281f3b85f32b022c220a971321be0c7bc150cb4
# Parent  3de266c52c9ae9cf6c75ae73bdb58b7ba528049e
(emerge-combine-versions-template): Make the
generated comments on the #else and #endif follow the GNU standards.

diff -r 3de266c52c9a -r a281f3b85f32 lisp/emerge.el
--- 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