diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-11-15 23:59:49 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-17 18:43:51 +0900 |
| commit | b93b81e799ba6a59820821b4ea3afdec1970fbd6 (patch) | |
| tree | 3c05d7b1328542c495fa92588df3b41db940f189 /builtin/merge-ours.c | |
| parent | git-fast-export.txt: clarify misleading documentation about rev-list args (diff) | |
| download | tgif-b93b81e799ba6a59820821b4ea3afdec1970fbd6.tar.xz | |
fast-export: use value from correct enum
ABORT and ERROR happen to have the same value, but come from differnt
enums. Use the one from the correct enum, and while at it, rename the
values to avoid such problems.
Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions