diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 17:41:54 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 17:41:54 (GMT) |
commit | a613b534bca2d56f2ad67b3a7f0cf2b34f031260 (patch) | |
tree | 2a54a3d0666577bf01234e5771e16dec7ccb240d /t/t1400-update-ref.sh | |
parent | 4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0 (diff) | |
parent | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff) | |
download | git-a613b534bca2d56f2ad67b3a7f0cf2b34f031260.zip git-a613b534bca2d56f2ad67b3a7f0cf2b34f031260.tar.gz git-a613b534bca2d56f2ad67b3a7f0cf2b34f031260.tar.bz2 |
Merge branch 'jc/fix-diff-files-unmerged' into maint
* 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/t1400-update-ref.sh')
-rwxr-xr-x | t/t1400-update-ref.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index ff747f8..4fd83a6 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -6,7 +6,7 @@ test_description='Test git update-ref and basic ref logging' . ./test-lib.sh -Z=0000000000000000000000000000000000000000 +Z=$_z40 test_expect_success setup ' |