| commit | f5b121aef305398a3e462b28240c0d6d754315c1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Apr 2012 20:58:53 +0000 (27 13:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Apr 2012 20:58:53 +0000 (27 13:58 -0700) | ||
| tree | cdc63f358e5258793205e337a907c56faef76d55 | treesnapshot (tar.gz zip) |
| parent | 7a9bb265d6b0d434fc967ea2dd7a2c446370ddf7 | commitdiff |
| parent | 51120683ec8664c8b34b8541a0518a4902ee9d94 | commitdiff |
Merge branch 'rt/cherry-revert-conflict-summary'
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
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
| sequencer.c | diff1 | diff2 | blobhistory |