Fix merge-one-file for our-side-added/our-side-removed cases