summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Lars Schneider <larsxschneider@gmail.com>2016-04-29 15:57:02 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-29 10:34:32 -0700
commit9e220fedf81cace5172ed86014e9ad425f7f3250 (patch)
treefe7a8bb4a6a910b24c0064a64526d030aa39e9e7 /t/t7610-mergetool.sh
parentt9824: fix broken &&-chain in a subshell (diff)
downloadtgif-9e220fedf81cace5172ed86014e9ad425f7f3250.tar.xz
t9824: fix wrong reference value
0492eb48 (t9824: fix broken &&-chain in a subshell, 2016-04-24) revealed a test that was broken from the beginning, as it expected a wrong size. The expected size of the file under test is 39 bytes. The test checked that the size is 13 bytes, but this was not noticed because it was breaking the &&-chain. Fix the reference value to make the test pass. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions