diff options
| author | John Keeping <john@keeping.me.uk> | 2013-02-07 20:15:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-12 19:42:07 (GMT) |
| commit | 41ee2ad6cbebab0429248a14ec4e02afddd60dbe (patch) | |
| tree | 6aa506a69925fe5235ad037c5d1f6e265e5a81e3 /diff.c | |
| parent | 30997bb8f11bd6e63a582c3b4e029ca47868ad8d (diff) | |
| download | git-41ee2ad6cbebab0429248a14ec4e02afddd60dbe.zip git-41ee2ad6cbebab0429248a14ec4e02afddd60dbe.tar.gz git-41ee2ad6cbebab0429248a14ec4e02afddd60dbe.tar.bz2 | |
combine-diff.c: teach combined diffs about line prefix
When running "git log --graph --cc -p" the diff output for merges is not
indented by the graph structure, unlike the diffs of non-merge commits
(added in commit 7be5761 - diff.c: Output the text graph padding before
each diff line).
Fix this by teaching the combined diff code to output diff_line_prefix()
before each line.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions