diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
| commit | 24161eb036e140c964d278e24190ef2ad558caf0 (patch) | |
| tree | 3e20ac3b018645953437dc896f382cf94545cc63 /t/t4003-diff-rename-1.sh | |
| parent | 53d31d71b7432391a8a5c7fdcbc38d803d6bd7e2 (diff) | |
| parent | 3a4d67692b5a80213ca47a603fa5505a5990cc87 (diff) | |
| download | git-24161eb036e140c964d278e24190ef2ad558caf0.tar.gz | |
Merge branch 'lt/rename-no-extra-copy-detection'
* lt/rename-no-extra-copy-detection:
diffcore-rename: improve estimate_similarity() heuristics
diffcore-rename: properly honor the difference between -M and -C
for_each_hash: allow passing a 'void *data' pointer to callback
Diffstat (limited to 't/t4003-diff-rename-1.sh')
| -rwxr-xr-x | t/t4003-diff-rename-1.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index c6130c4019..bfa8835638 100755 --- a/t/t4003-diff-rename-1.sh +++ b/t/t4003-diff-rename-1.sh @@ -29,7 +29,7 @@ test_expect_success \ # copy-and-edit one, and rename-and-edit the other. We do not say # anything about rezrov. -GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current +GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current cat >expected <<\EOF diff --git a/COPYING b/COPYING.1 copy from COPYING |