Clone
Cédric Champeau
committed
on 05 Sep 17
Turn `ConflictResolution` into an enum
The previous implemention was an adhoc enum, using an interface and concrete
classes. Probably code w… Show more
Turn `ConflictResolution` into an enum

The previous implemention was an adhoc enum, using an interface and concrete

classes. Probably code written pre-enum era.

Show less

master + 486 more