Changes for version 0.03
- Fixed some bugs in the traverse_sequences3, diff3, and merge routines.
- merge: properly manage conflicts that remain after processing the diff3 results
- traverse_sequences3: defined some more states in the Callback Map.
- diff3: handle some sequence differences better
- Thanks to Martin Hosken for bringing these to our attention.
Modules
Three-way merge and diff