SHA1 Hash:	ac6bb3ce069523ecc7b664ff41a8b5cc3fc7f657
Date:	2007-11-07 22:22:02
User:	drh
Comment:	Improvements to the merge algorithm so that it works better for common changes. Still more work needed.
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 [5d18e08162] to [73c60b9f66].    [diff]