Fix bit assignment for CE_CONFLICTED
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Jan 2010 08:02:00 +0000 (00:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Jan 2010 08:02:08 +0000 (00:02 -0800)
CE_WT_REMOVE has already grabbed the same value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found