SHA1 Hash:	92638367d8421bba4b8ed904eb33daa396b8093f
Date:	2009-03-22 13:18:10
User:	drh
Comment:	Add many new test cases for 3-way merge. No new problems found.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified test/merge3.test from [f3315ba437] to [e745bf699d].    [diff]

Added test/merge4.test version [61232e82e6]