Junio C Hamano a28b919f05 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

2012-05-07 13:13:43 -07:00

26 KiB

Raw Blame History

View Raw