mergetools / vimdiff2on commit RelNotes: am.threeWay does not exist (yet) (6f9504c)
   1. "$MERGE_TOOLS_DIR/vimdiff"