mergetools / gvimdiff2on commit Merge branch 'nd/parseopt-completion-more' (ef06d74)
   1. "$MERGE_TOOLS_DIR/vimdiff"