| commit | 187c00c6c58ba8916a37011b56cb0cb8f2dd1805 | |
| author | John Keeping <john@keeping.me.uk> | |
| Wed, 27 Mar 2013 15:58:50 +0000 (27 15:58 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 17:00:50 +0000 (27 10:00 -0700) | ||
| tree | fc445362575632fc40f89893d1caacdb976f4445 | treesnapshot (tar.gz zip) |
| parent | 6bf6366cc6ac3de57ddb77e653d246aba333973d | commitdiff |
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>
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>
| builtin/merge-tree.c | diffblobblamehistory |