diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-18 00:32:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 10:49:03 -0700 |
| commit | 903e09a3ecca8941b32bae08b821545941591348 (patch) | |
| tree | d91e053a26f3f295e05c3f6e2228d6bb8f5a57ec /t/t5402-post-merge-hook.sh | |
| parent | Cosmetical command name fix (diff) | |
| download | tgif-903e09a3ecca8941b32bae08b821545941591348.tar.xz | |
diff/diff-files: do not use --cc too aggressively
Textual diff output for unmerged paths was too eager to give condensed
combined diff. Even though "diff -c" (and "diff-files -c -p") is a
request to view combined diff without condensing (otherwise the user would
have explicitly asked for --cc, not -c), we showed "--cc" output anyway.
0fe7c1d (built-in diff: assorted updates, 2006-04-29) claimed to be
careful about doing this, but its breakage was hidden because back then
"git diff" was still a shell script that did not use the codepath it
introduced fully.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5402-post-merge-hook.sh')
0 files changed, 0 insertions, 0 deletions