John Arbash Meinel writes: > - From the help message: > > action: > --action=ARG How to resolve the conflict. > --done Marks the conflict as resolved > --take-other Resolve the conflict taking the merged version into > account > --take-this Resolve the conflict preserving the version in the > working tree Ungh. How ... unpythonic. :-(