mergetools / vimdiff2on commit Merge branch 'jk/diff-filespec-cleanup' (e049109)
   1. "$MERGE_TOOLS_DIR/vimdiff"