diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 21:52:58 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 21:52:58 +0400 |
commit | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch) | |
tree | 0091b831de88064187f0ddfd637b8ff93883eded /t/test-lib.sh | |
parent | 6c252ef79e314eef8fca862cca8a63329fa7591c (diff) | |
parent | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff) |
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/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 c5b18e282a..b2ce2bc4b2 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... |