-
Committer:
Gary van der Merwe
-
Date:
2009-09-15 11:22:27 UTC
-
mto:
(4634.46.1 2.0-integration)
-
mto:
This revision was merged to the branch mainline in
revision
4702.
-
Revision ID:
garyvdm@gmail.com-20090915112227-jcrujse8j1ytsb7h
Revert rename of test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.