git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71a3222 5112068)
Merge branch 'rt/cherry-revert-conflict-summary' into maint
authorJunio C Hamano <redacted>
Mon, 7 May 2012 20:13:43 +0000 (13:13 -0700)
committerJunio C Hamano <redacted>
Mon, 7 May 2012 20:13:43 +0000 (13:13 -0700)
commita28b919f05ed29cd9e6615179bd56edde50c6b63
tree92f089912f4fcddf2386f69f5be40a1a1b047db2tree | snapshot
parent71a32223149f60f4a42141ad4d3526c4439034eccommit | diff
parent51120683ec8664c8b34b8541a0518a4902ee9d94commit | diff
Merge branch 'rt/cherry-revert-conflict-summary' into maint

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 | blob | history
git clone https://git.99rst.org/PROJECT