bzr resolve --action=ARG

[Martin Pool]

On 30 September 2010 07:40, John Arbash Meinel <john at arbash-meinel.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 9/29/2010 3:54 PM, Eli Zaretskii wrote:
>> Neither the output of "bzr help resolve" nor the manual bundled with
>> Bazaar 2.2.1 say anything about ARG in --action=ARG.  Can someone
>> please tell what can it be and how it is used?
>>
>> TIA
>
> - 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
>
> ARG can be "done" "take-other" or "take-this".

The help text generator could be better though.

-- 
Martin