summaryrefslogtreecommitdiff
path: root/t/t4027-diff-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 17:52:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-06 17:52:58 (GMT)
commit22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch)
tree0091b831de88064187f0ddfd637b8ff93883eded /t/t4027-diff-submodule.sh
parent6c252ef79e314eef8fca862cca8a63329fa7591c (diff)
parent095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff)
downloadgit-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.zip
git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.gz
git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.bz2
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-xt/t4027-diff-submodule.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 241a74d..518bf95 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 &&