← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics.py
564
564
"""
565
565
 
566
566
_criss_cross = \
567
 
"""
 
567
"""Criss-Cross
 
568
 
568
569
A criss-cross in the branch history can cause the default merge technique
569
570
to emit more conflicts than would normally be expected.
570
571