/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/version.py

  • Committer: Andrew Bennetts
  • Date: 2010-04-19 05:41:54 UTC
  • mto: This revision was merged to the branch mainline in revision 5181.
  • Revision ID: andrew.bennetts@canonical.com-20100419054154-k5pq9dlm977cwpal
Allow Merge3 to work with objects, not just lists of strs.  This removes a lot of cruft from news_merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
27
27
    osutils,
28
28
    trace,
29
29
    )
 
30
from bzrlib.branch import Branch
30
31
 
31
32
 
32
33
def show_version(show_config=True, show_copyright=True, to_file=None):