← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2006-05-23 00:03:45 UTC
  • mto: (1724.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1725.
  • Revision ID: robertc@robertcollins.net-20060523000345-b54523c712b3b696
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
919
919
                     "diff3": (Diff3Merger,  "Merge using external diff3"),
920
920
                     'weave': (WeaveMerger, "Weave-based merge")
921
921
              }
922
 
 
923
 
 
924
 
def merge_type_help():
925
 
    templ = '%s%%7s: %%s' % (' '*12)
926
 
    lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
927
 
    return '\n'.join(lines)