diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:13:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:13:43 -0700 |
| commit | a28b919f05ed29cd9e6615179bd56edde50c6b63 (patch) | |
| tree | 92f089912f4fcddf2386f69f5be40a1a1b047db2 /Documentation/git-diff.txt | |
| parent | Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maint (diff) | |
| parent | sequencer: remove additional blank line (diff) | |
| download | tgif-a28b919f05ed29cd9e6615179bd56edde50c6b63.tar.xz | |
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
Diffstat (limited to 'Documentation/git-diff.txt')
0 files changed, 0 insertions, 0 deletions