Add support for three-way diffs