Re: [PATCH] git-merge-changelog: fix conflict markers

2024-06-24 Thread Bruno Haible
Hi Andreas, Your chances would be higher for a patch to be applied if you gave a rationale / justification, and if the patch contained comments. I did my own research and found a rationale — possibly different from yours. So I added your patch, and this followup. Also, I changed the words "fix" a

[PATCH] git-merge-changelog: fix conflict markers

2024-06-24 Thread Andreas Schwab
* lib/git-merge-changelog.c (conflict_write): Add missing space after marker. --- lib/git-merge-changelog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index c701d29942..b30045e2aa 100644 --- a/lib/gi