summaryrefslogtreecommitdiff
path: root/t/t1013
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-03-27 15:58:50 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-27 10:00:50 -0700
commit187c00c6c58ba8916a37011b56cb0cb8f2dd1805 (patch)
treefc445362575632fc40f89893d1caacdb976f4445 /t/t1013
parentgit-commit doc: describe use of multiple `-m` options (diff)
downloadtgif-187c00c6c58ba8916a37011b56cb0cb8f2dd1805.tar.xz
merge-tree: fix typo in merge-tree.c::unresolved
When calculating whether there is a d/f conflict, the calculation of whether both sides are directories generates an incorrect references mask because it does not use the loop index to set the correct bit. Fix this typo. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1013')
0 files changed, 0 insertions, 0 deletions