-
Committer:
Robert Collins
-
Date:
2005-08-25 10:04:51 UTC
-
mto:
(974.1.50)
(1185.1.10)
(1092.3.1)
-
mto:
This revision was merged to the branch mainline in
revision
1139.
-
Revision ID:
robertc@robertcollins.net-20050825100451-b01297285491ba46
make a default merge choose a sane base with branch.common_ancestor