mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Fix bit assignment for CE_CONFLICTED
CE_WT_REMOVE has already grabbed the same value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e11d7b5969
commit
bf96c93199