-
Committer:
John Arbash Meinel
-
Date:
2010-02-04 16:31:42 UTC
-
Revision ID:
john@arbash-meinel.com-20100204163142-85hlqmp5igoabg6g
Sort out some more details for the 3-way merge code.
The main problem I was running into was that the constructor always suppressed parse failures.