mergetools / vimdiff2on commit Merge branch 'mv/merge-ff-tristate' (9678ee7)
   1. "$MERGE_TOOLS_DIR/vimdiff"