Viewing all changes in revision 2255.7.12.
- Committer: John Arbash Meinel
- Date: 2007-02-26 17:09:38 UTC
- mto: (2255.11.3 dirstate)
- mto: This revision was merged to the branch mainline in revision 2322.
- Revision ID: john@arbash-meinel.com-20070226170938-ik5w1cd0a1tuzsgq
Some comments on merge code, fix merge tests that
assume basis_tree() is valid after the tree has been modified.
assume basis_tree() is valid after the tree has been modified.
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
