mergetools / vimdiff2on commit merge-recursive: remove final remaining caller of merge_file_one() (0270a07)
   1. "$MERGE_TOOLS_DIR/vimdiff"