/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

Add merge indication to line format (Neil Martinsen-Burrell)

Show diffs side-by-side

added added

removed removed

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