diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:58 -0700 |
| commit | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch) | |
| tree | 0091b831de88064187f0ddfd637b8ff93883eded /t/t4020-diff-external.sh | |
| parent | Merge branch 'cj/p4merge' (diff) | |
| parent | diff-files: show unmerged entries correctly (diff) | |
| download | tgif-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.xz | |
Merge branch 'jc/fix-diff-files-unmerged'
* jc/fix-diff-files-unmerged:
diff-files: show unmerged entries correctly
diff: remove often unused parameters from diff_unmerge()
diff.c: return filepair from diff_unmerge()
test: use $_z40 from test-lib
Diffstat (limited to 't/t4020-diff-external.sh')
| -rwxr-xr-x | t/t4020-diff-external.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index a7602cf923..083f62d1d6 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -4,8 +4,6 @@ test_description='external diff interface test' . ./test-lib.sh -_z40=0000000000000000000000000000000000000000 - test_expect_success setup ' test_tick && |