mergetools / gvimdiff3on commit Merge branch 'jk/info-alternates-fix-2.11' into jk/info-alternates-fix (0db625f)
   1. "$MERGE_TOOLS_DIR/vimdiff"