Hi Ulrich,

On Thu, 25 Jul 2019, Ulrich Windl wrote:

quoted

quoted

quoted

Johannes Schindelin [off-list ref] schrieb am 25.07.2019 um

12:07
in Nachricht [ref]:

quoted

On Wed, 24 Jul 2019, Ulrich Windl wrote:

quoted

When using "git merge --no-ff --no-commit ..", the pre-created
merge message always contains two empty lines in between the
comment lines. However if there was a merge conflict (being
resolved) an extra blank line is added after the fiVrst line.

[...]

Could anybody provide a rough overview how and where these editor
comments are created?

The best bet would be to call `git grep` with text in that pre-created
merge message, preferably some text that is most likely fixed, i.e. that
does not depend on the current worktree/commit.

If you give me an example of such a merge message, I can provide you
with the appropriate `git grep` call and the code locations to touch.

Ciao,
Johannes