mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-20 17:54:13 -05:00
a28b919f05
In the older days, the header "Conflicts:" in "cherry-pick" and "merge" was separated by a blank line from the list of paths that follow for readability, but when "merge" was rewritten in C, we lost it by mistake. Remove the newline from "cherry-pick" to make them match again. By Ralf Thielow * rt/cherry-revert-conflict-summary: sequencer: remove additional blank line
26 KiB
26 KiB