Viewing all changes in revision 5050.73.13.
- Committer: Vincent Ladeuil
- Date: 2011-07-07 10:20:59 UTC
- mto: (6012.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6013.
- Revision ID: v.ladeuil+lp@free.fr-20110707102059-xze39u9kino70aqg
Fix the test for trunk where merging into an empty branch now behave differently
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
