Viewing all changes in revision 3146.4.4.
- Committer: Aaron Bentley
- Date: 2007-12-29 21:25:26 UTC
- mto: This revision was merged to the branch mainline in revision 3162.
- Revision ID: aaron.bentley@utoronto.ca-20071229212526-d8xatqs93g0m6l6q
Add write lock, so merge_inner works properly
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
