← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2007-12-05 22:52:58 UTC
  • mfrom: (3080 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3084.
  • Revision ID: john@arbash-meinel.com-20071205225258-kn799zf3tewncv7p
[merge] bzr.dev 3080

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/resolving_conflicts.txt
58
58
  bzr remerge --weave foo
59
59
 
60
60
where ``foo`` is the file and ``weave`` is one of the available
61
 
merge algorithms. See the online help for ``remerge`` or the
62
 
User Reference for further details.
 
61
merge algorithms. This algorithm is particularly useful when a
 
62
so-called ``criss-cross`` merge is detected, e.g. when two branches
 
63
merge the same thing then merge each other. See the online help for
 
64
``criss-cross`` and ``remerge`` for further details.
63
65
 
64
66
Using external tools to resolve conflicts
65
67
-----------------------------------------