mergetools / vimdiff2on commit Merge branch 'rr/triangle' (4d35924)
   1. "$MERGE_TOOLS_DIR/vimdiff"