bzr resolve --action=ARG

[John Arbash Meinel]

-----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".

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkyjsmEACgkQJdeBCYSNAANm7gCgpV5YwzLI0xZ/YhRZARaJdXz3
KqUAnRVAJHrBuOROQ0ph9G6jSgH15kTG
=6yi2
-----END PGP SIGNATURE-----