diff options
| author | John Keeping <john@keeping.me.uk> | 2013-03-27 15:58:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:00:50 -0700 |
| commit | 187c00c6c58ba8916a37011b56cb0cb8f2dd1805 (patch) | |
| tree | fc445362575632fc40f89893d1caacdb976f4445 /t/t4300-merge-tree.sh | |
| parent | 6bf6366cc6ac3de57ddb77e653d246aba333973d (diff) | |
| download | git-187c00c6c58ba8916a37011b56cb0cb8f2dd1805.tar.gz git-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/t4300-merge-tree.sh')
0 files changed, 0 insertions, 0 deletions