Ubuntu
bzr package

  1. Maverick (10.10)
  2. Bug #646961
  3. Comment #3

Comment 3 for bug 646961

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

--take-this and --take-other are *not* (yet) implemented for TextConflict, there is a related FIXME about the root cause of the bug here: we try to resolve the conflict as being a PathConflict which is totally not appropriate in this case :-/