mergetools / vimdiff2on commit diffcore-rename.c: move code around to prepare for the next patch (48f6407)
   1. "$MERGE_TOOLS_DIR/vimdiff"