diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-01 20:48:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-01 20:49:51 (GMT) |
| commit | b52e985a4f824128d01220473b04057a4876060d (patch) | |
| tree | 7f2ecb63e2f548361768631bf2c4f1df11de5626 /t | |
| parent | cec0d5a3bbde60db4589d8e84a36d0ade653472e (diff) | |
| parent | 1d557352f18a4b8f73be402674af6bd5bb152ab9 (diff) | |
| download | git-b52e985a4f824128d01220473b04057a4876060d.zip git-b52e985a4f824128d01220473b04057a4876060d.tar.gz git-b52e985a4f824128d01220473b04057a4876060d.tar.bz2 | |
Merge 1.5.3.7 in
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4008-diff-break-rewrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh index 5836e3a..1287d2a 100755 --- a/t/t4008-diff-break-rewrite.sh +++ b/t/t4008-diff-break-rewrite.sh @@ -119,7 +119,7 @@ test_expect_success \ 'compare_diff_raw expected current' test_expect_success \ - 'run diff with -B' \ + 'run diff with -B -M' \ 'git diff-index -B -M "$tree" >current' # This should not mistake file0 as the copy source of new file1 |