← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2006-05-23 10:57:02 UTC
  • mfrom: (1725 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1726.
  • Revision ID: mbp@sourcefrog.net-20060523105702-e5de4664cfdb4e8d
[merge] bzr.dev

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)