Add many new test cases for 3-way merge.  No new problems found.