From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 25 Feb 1996 22:53:18 +0000 (+0000)
Subject: (emerge-combine-versions-template): Make the
X-Git-Tag: emacs-19.34~1192
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=504621b9835f537161464bb88113fd9bfaf22de8;p=emacs.git

(emerge-combine-versions-template): Make the
generated comments on the #else and #endif follow the GNU standards.
---

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