Comment 2 for bug 652336

I suggest something like this

action:
 --action=ARG (or --ARG for short) How to resolve the conflict.
 done Marks the conflict as resolved. This is the default, when no action is specified.
 take-other Resolve the conflict taking the merged version into account
 take-this Resolve the conflict preserving the version in the working tree

That is, use the form without the leading "--" in the description of ARG.