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/t4027-diff-submodule.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/t4027-diff-submodule.sh')
-rwxr-xr-x | t/t4027-diff-submodule.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh index 241a74d2a2..518bf9524e 100755 --- a/t/t4027-diff-submodule.sh +++ b/t/t4027-diff-submodule.sh @@ -5,7 +5,6 @@ test_description='difference in submodules' . ./test-lib.sh . "$TEST_DIRECTORY"/diff-lib.sh -_z40=0000000000000000000000000000000000000000 test_expect_success setup ' test_tick && test_create_repo sub && |