Bazaar

  1. Bug #652336
  2. Comment #1

Comment 1 for bug 652336

Revision history for this message
Vincent Ladeuil (vila) wrote :

The generated help should mention something like (--action=ARG or --ARG for short).

I.e:

 action:
 --action=ARG (or --ARG for short) 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