To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4927.2.10.
-
Committer:
Ian Clatworthy
-
Date:
2010-01-08 07:34:31 UTC
-
mto:
(4944.1.1 integration)
-
mto:
This revision was merged to the branch mainline in
revision
4945.
-
Revision ID:
ian.clatworthy@canonical.com-20100108073431-qtxf2unw83f6d43n
fix test failures
-
bzrlib/plugins/news_merge
-
bzrlib/plugins/news_merge/tests
-
bzrlib/tests/per_bzrdir_colo
- files renamed:
-
bzrlib/help_topics/es/conflict-types.txt
=>
doc/es/user-guide/resolving_conflicts.txt
expand all
collapse all
Show diffs side-by-side
added
removed