diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-27 14:19:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-27 14:19:36 -0800 |
| commit | 20c8cde45656fc187e06088ef5baf0bbdfdf70bd (patch) | |
| tree | a9cb9f370e9b7bcecc124fa73c8a1b7d30c25c8e /t/t3507-cherry-pick-conflict.sh | |
| parent | diff --stat: do not count "unmerged" entries (diff) | |
| download | tgif-20c8cde45656fc187e06088ef5baf0bbdfdf70bd.tar.xz | |
diff --shortstat: do not count "unmerged" entries
Fix the same issue as the previous one for "git diff --stat";
unmerged entries was doubly-counted.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions