From 63344d0d3cdbdfcff2220903d5421235b29d3548 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 24 Jun 2024 13:11:31 +0200 Subject: [PATCH] git-merge-changelog: Improve last commit. * lib/git-merge-changelog.c (conflict_write): Add comments. --- ChangeLog | 5 +++++ lib/git-merge-changelog.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5cff39f7c6..9a702d4af3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-06-24 Bruno Haible + + git-merge-changelog: Improve last commit. + * lib/git-merge-changelog.c (conflict_write): Add comments. + 2024-06-24 Andreas Schwab git-merge-changelog: Improve conflict markers. diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index b30045e2aa..3cffe1fd2f 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -962,6 +962,9 @@ conflict_write (FILE *fp, struct conflict *c) 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); -- 2.39.5