Error in BZR Wiki document?

[Jan Djärv]

Quote:
"The merge may fail due to a change that conflicts with your branch. You’ll 
need to fix the problem (looking for conflict markers and editing, just as in 
CVS), then

      bzr resolve -m file-you-changed ...      # Mark these conflicts as 
resolved.
                                               # Bazaar keeps track of 
unresolved conflicts,
                                               # and won't let you commit 
until all are resolved.

"

Ok, I edit ChangeLog and remove markers, then:

% bzr resolve -m ChangeLog
bzr: ERROR: no such option: -m

Hmm, lets remove -m then:
% bzr resolve ChangeLog
src/ChangeLog is not conflicted

What is bzr resolve supposed to do anyway?

        Jan D.

(BTW, pulling trunk again for 5 Mbytes worth of changes required 177 Mbytes to 
download from the server).