diffcore-rename: fix merging back a broken pair.