diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-01-25 11:55:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 00:08:29 -0800 |
| commit | e228340961e0f48c6b818251bd4729b2d19647e4 (patch) | |
| tree | 6b8ddfd4744d9682e5de667768d27f74c9737fef /Documentation/git-merge.txt | |
| parent | combine-diff: fix appending at the tail of a list. (diff) | |
| download | tgif-e228340961e0f48c6b818251bd4729b2d19647e4.tar.xz | |
combine-diff: minor output changes.
Remove extra whitespace between the change indicators and the
body text. That is more in line with the uncombined unified
diff output (pointed out by Santi Bejar).
When showing --cc, say so instead of saying just --combined.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions