Viewing all changes in revision 2255.2.50.
- Committer: John Arbash Meinel
- Date: 2007-02-14 20:13:27 UTC
- mto: (2255.5.1 dirstate) (2321.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 2322.
- Revision ID: john@arbash-meinel.com-20070214201327-16eleapizxjo7vm6
merge only needs a lock_tree_write() on the working tree, not a full lock_write()
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
