mergetools / gvimdiff2on commit Merge branch 'ef/non-ascii-parse-options-error-diag' (6bdecc8)
   1. "$MERGE_TOOLS_DIR/vimdiff"