-
Committer:
Aaron Bentley
-
Date:
2005-09-14 16:35:46 UTC
-
mto:
(1185.1.16)
-
mto:
This revision was merged to the branch mainline in
revision
1390.
-
Revision ID:
abentley@panoramicfeedback.com-20050914163546-ef044baf4ef9c135
Improved merge error handling and testing