/brz/remove-bazaar

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Viewing all changes in revision 5535.2.4.

Committer: Andrew Bennetts
Date: 2010-11-11 23:48:07 UTC
mfrom: (5537 +trunk)
mto: This revision was merged to the branch mainline in revision 5538.
Revision ID: andrew.bennetts@canonical.com-20101111234807-fg7cjilh8gi3vud4

Merge lp:bzr.

files added:
bzrlib/tests/blackbox/test_resolve.py

files modified:
bzrlib/commit.py

bzrlib/conflicts.py

bzrlib/tests/blackbox/__init__.py

bzrlib/tests/blackbox/test_conflicts.py

bzrlib/tests/blackbox/test_tags.py

bzrlib/tests/test_conflicts.py

doc/en/release-notes/bzr-2.2.txt

doc/en/release-notes/bzr-2.3.txt

doc/en/whats-new/whats-new-in-2.3.txt

Show diffs side-by-side

added added

removed removed

bzrlib/commit.py

bzrlib/conflicts.py

bzrlib/tests/blackbox/__init__.py

bzrlib/tests/blackbox/test_conflicts.py

bzrlib/tests/blackbox/test_resolve.py

bzrlib/tests/blackbox/test_tags.py

bzrlib/tests/test_conflicts.py

doc/en/release-notes/bzr-2.2.txt

doc/en/release-notes/bzr-2.3.txt

doc/en/whats-new/whats-new-in-2.3.txt

Older »