← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/en/conflicts.txt

Add a NEWS entry and prepare submission.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/en/conflicts.txt
360
360
 
361
361
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
362
362
.. FIXME: Arguably .OTHER should be used instead of .new.
 
363
.. FIXME: If .new doesn't exist anymore, --auto may consider
 
364
marking the conflict resolved.
363
365
 
364
366
MalformedTransform
365
367
------------------