← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/conflicts.txt

  • Committer: Vincent Ladeuil
  • Date: 2007-11-04 15:29:17 UTC
  • mfrom: (2961 +trunk)
  • mto: (2961.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2962.
  • Revision ID: v.ladeuil+lp@free.fr-20071104152917-nrsumxpk3dikso2c
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/conflicts.txt
169
169
MalformedTransform
170
170
==================
171
171
It is possible (though very rare) for Bazaar to raise a MalformedTransform
172
 
exception.  This means that Bazaar encounted a filesystem conflict that it was
 
172
exception.  This means that Bazaar encountered a filesystem conflict that it was
173
173
unable to resolve.  This usually indicates a bug.  Please let us know if you
174
174
encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs