(emerge-combine-versions-template): Make the

generated comments on the #else and #endif follow the GNU standards.
This commit is contained in:
Richard M. Stallman 1996-02-25 22:53:18 +00:00
parent 59115a2281
commit 504621b983

View file

@ -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