summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Thomas Gummerer <t.gummerer@gmail.com>2015-03-20 19:20:30 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 12:39:39 -0700
commite869c5eaeeef0c264abb9d98b097a4765d44876b (patch)
tree363ea14cf38650b6a26f5ff6fe733fb3a66aa2b5 /t/t3309-notes-merge-auto-resolve.sh
parentGit 2.3 (diff)
downloadtgif-e869c5eaeeef0c264abb9d98b097a4765d44876b.tar.xz
t1700: make test pass with index-v4
The different index versions have different sha-1 checksums. Those checksums are checked in t1700, which makes it fail when the test suite is run with TEST_GIT_INDEX_VERSION=4. Fix it. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions