Bazaar

  1. Bug #680537
  2. Comment #1

Comment 1 for bug 680537

Revision history for this message
Jon Loldrup (loldrup) wrote :

or better:
"use 'bzr resolve' when conflict(s) has been mitigated"
->
"use 'bzr resolve' when you have resolved the conflict(s)"