Viewing all changes in revision 3514.4.32.
- Committer: John Arbash Meinel
- Date: 2008-08-01 14:26:55 UTC
- mto: (3697.7.4 1.7)
- mto: This revision was merged to the branch mainline in revision 3748.
- Revision ID: john@arbash-meinel.com-20080801142655-fi5f6rtys5tlu6ez
Add a test for proper behavior when *everything* is a WT.
This only really happens in the test suite, you'll never get a LCA Tree as a WT
in standard behavior (I don't know if you could get a BASE tree as a wT).
Also, clean up some trailing whitespace.
This only really happens in the test suite, you'll never get a LCA Tree as a WT
in standard behavior (I don't know if you could get a BASE tree as a wT).
Also, clean up some trailing whitespace.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
