Viewing all changes in revision 4597.3.39.
- Committer: Vincent Ladeuil
- Date: 2009-10-27 16:23:30 UTC
- mfrom: (4597.4.12 shell-like-tests)
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20091027162330-rv91oa9hi0y5x0pq
Merge shell-like-tests into description resolving conflicts
- files added:
- bzrlib/static_tuple.py
- bzrlib/tests/per_foreign_vcs
- files modified:
- Makefile
expand all
collapse all
added
removed
