SHA1 Hash:	81122988ba271d135ce26071eb584f0d8bbe1caf
Date:	2009-03-21 19:18:22
User:	drh
Comment:	More improvements to the 3-way merge. Additional test cases added.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

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

Modified src/merge3.c from [bd94cf9eaa] to [137ba3bf55].    [diff]

Modified test/delta1.test from [08d7071c42] to [b0dba644d2].    [diff]

Modified test/merge1.test from [eed9903dc2] to [310813fc4c].    [diff]