* 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/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -964,13 +964,13 @@ conflict_write (FILE *fp, struct conflict *c)
/* Use the same syntax as git's default merge driver.
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);
+ fputs ("<<<<<<< \n", fp);
for (i = 0; i < c->num_old_entries; i++)
entry_write (fp, c->old_entries[i]);
fputs ("=======\n", fp);
for (i = 0; i < c->num_modified_entries; i++)
entry_write (fp, c->modified_entries[i]);
- fputs (">>>>>>>\n", fp);
+ fputs (">>>>>>> \n", fp);
}
/* Long options. */
--
2.45.2
--
Andreas Schwab, SUSE Labs, [email protected]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
