update comments to say "three-way" diff.