summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-04 00:02:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-04 00:02:08 -0800
commitbf96c931994382d99e4e4d55f7b22b6779787a9d (patch)
treee8d2108a32b9ad90089933b8c73926a82d4473e8 /contrib
parent"reset --merge": fix unmerged case (diff)
downloadtgif-bf96c931994382d99e4e4d55f7b22b6779787a9d.tar.xz
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 'contrib')
0 files changed, 0 insertions, 0 deletions