mergetools / vimdiff2on commit Merge branch 'nd/diff-flush-before-warning' (17c8e0b)
   1. "$MERGE_TOOLS_DIR/vimdiff"