(emerge-combine-versions-template): Make the
generated comments on the #else and #endif follow the GNU standards.
This commit is contained in:
parent
59115a2281
commit
504621b983
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue