← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-20 14:47:39 UTC
  • mfrom: (1551.6.22 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060520144739-b795ddda465031a9
Improved help for remerge and merge

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)