Diff Merge Tool

Three-way merge comparison tool for resolving conflicts

Original

Version 1

Version 2