Hi!
I'd like to report an old-time bug in git, regarding the default message visible for a "git merge --no-commit" (at the later commit, of course):
* When merging a branch, the first name is put in single quotes, while the second is not.
* There is no blank line after the first one
* there are two blank lines further down
I'll attach a sample default merge file as found in the editor.
I suggest to put both branches in single quotes, and to either remove the two blank lines, or make them comment lines (for visual separation)
Regards, Ulrich