Viewing all changes in revision 1185.2.19.
- Committer: Lalo Martins
- Date: 2005-09-15 15:28:33 UTC
- mto: (1185.1.22)
- mto: This revision was merged to the branch mainline in revision 1390.
- Revision ID: lalo@exoweb.net-20050915152832-1b23c36b1f0fffc4
made tests pass again, after merge from integration
- files modified:
- bzrlib/selftest/testmerge.py
expand all
collapse all
added
removed
