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/test-lib.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/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index abc47f3..8a274fb 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -89,6 +89,9 @@ esac _x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x05$_x05" +# Zero SHA-1 +_z40=0000000000000000000000000000000000000000 + # Each test should start with something like this, after copyright notices: # # test_description='Description of this test... |