diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-04 00:02:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-04 00:02:08 -0800 |
| commit | bf96c931994382d99e4e4d55f7b22b6779787a9d (patch) | |
| tree | e8d2108a32b9ad90089933b8c73926a82d4473e8 /contrib/emacs/git.el | |
| parent | "reset --merge": fix unmerged case (diff) | |
| download | tgif-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/emacs/git.el')
0 files changed, 0 insertions, 0 deletions