mergetools / gvimdiff3on commit Merge branch 'jk/tap-verbose-fix' (f4db874)
   1. "$MERGE_TOOLS_DIR/vimdiff"