]> Savannah Git Hosting - gnulib.git/commit
git-merge-changelog: Improve conflict markers.
authorAndreas Schwab <schwab@suse.de>
Mon, 24 Jun 2024 10:38:39 +0000 (12:38 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 24 Jun 2024 11:10:34 +0000 (13:10 +0200)
commitd284d180517d7a004f60edefe52ed7c3042b0f61
tree916b358afefcd9cf73e4eb651dd3b8f0d47e50ef
parent9055dbb4a0585eaf7d8e98d1ddb0f47e4ffe22fa
git-merge-changelog: Improve conflict markers.

* lib/git-merge-changelog.c (conflict_write): Add a space after <<<<<<<
and >>>>>>>.

Copyright-paperwork-exempt: Yes
ChangeLog
lib/git-merge-changelog.c