* lib/git-merge-changelog.c (conflict_write): Add comments.
+2024-06-24 Bruno Haible <bruno@clisp.org>
+
+ git-merge-changelog: Improve last commit.
+ * lib/git-merge-changelog.c (conflict_write): Add comments.
+
2024-06-24 Andreas Schwab <schwab@suse.de>
git-merge-changelog: Improve conflict markers.
idx_t i;
/* Use the same syntax as git's default merge driver.
+ The spaces after <<<<<<< and >>>>>>> are for compatibility with
+ git/rerere.c, function 'is_cmarker'. Usually they would be followed by
+ branch or version names, but this info is not available to us here.
Don't indent the contents of the entries (with things like ">" or "-"),
otherwise the user needs more textual editing to resolve the conflict. */
fputs ("<<<<<<< \n", fp);