/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-02-05 20:03:29 UTC
  • mto: (3998.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3999.
  • Revision ID: nmb@wartburg.edu-20090205200329-bhneu8nhzhdgv0m0
add merge indication to the line format

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
1360
1360
            out.append("%s:" % revno)
1361
1361
        out.append(self.truncate(self.short_author(rev), 20))
1362
1362
        out.append(self.date_string(rev))
 
1363
        if len(rev.parent_ids) > 1:
 
1364
            out.append('[merge]')
1363
1365
        if tags:
1364
1366
            tag_str = '{%s}' % (', '.join(tags))
1365
1367
            out.append(tag_str)