← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textui.py

  • Committer: Robert Collins
  • Date: 2005-08-25 10:04:51 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825100451-b01297285491ba46
make a default merge choose a sane base with branch.common_ancestor

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textui.py
21
21
    if kind == 'directory':
22
22
        # use this even on windows?
23
23
        kind_ch = '/'
 
24
    elif kind == 'symlink':
 
25
        kind_ch = '->'
24
26
    else:
25
27
        assert kind == 'file', ("can't handle file of type %r" % kind)
26
28
        kind_ch = ''