+2024-06-24 Andreas Schwab <schwab@suse.de>
+
+ git-merge-changelog: Improve conflict markers.
+ * lib/git-merge-changelog.c (conflict_write): Add a space after <<<<<<<
+ and >>>>>>>.
+
2024-06-23 Collin Funk <collin.funk1@gmail.com>
test-framework-sh: Fix typo in function invocation (regression 2024-06-11).
/* 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. */