mergetools / gvimdiff2on commit Merge branch 'mt/dir-iterator-updates' (080af91)
   1. "$MERGE_TOOLS_DIR/vimdiff"