fix 3-way diffs with differing column sets