| commit | bf96c931994382d99e4e4d55f7b22b6779787a9d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Jan 2010 08:02:00 +0000 (4 00:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Jan 2010 08:02:08 +0000 (4 00:02 -0800) | ||
| tree | e8d2108a32b9ad90089933b8c73926a82d4473e8 | treesnapshot (tar.gz zip) |
| parent | e11d7b5969704cd5ce39d053414d905bb203886b | commitdiff |
Fix bit assignment for CE_CONFLICTED
CE_WT_REMOVE has already grabbed the same value.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
CE_WT_REMOVE has already grabbed the same value.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| cache.h | diffblobblamehistory |