merge-ort: call diffcore_rename() directly