diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-04 08:02:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-04 08:02:08 (GMT) |
| commit | bf96c931994382d99e4e4d55f7b22b6779787a9d (patch) | |
| tree | e8d2108a32b9ad90089933b8c73926a82d4473e8 /refs.h | |
| parent | e11d7b5969704cd5ce39d053414d905bb203886b (diff) | |
| download | git-bf96c931994382d99e4e4d55f7b22b6779787a9d.zip git-bf96c931994382d99e4e4d55f7b22b6779787a9d.tar.gz git-bf96c931994382d99e4e4d55f7b22b6779787a9d.tar.bz2 | |
Fix bit assignment for CE_CONFLICTED
CE_WT_REMOVE has already grabbed the same value.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.h')
0 files changed, 0 insertions, 0 deletions