mergetools / gvimdiff2on commit Merge branch 'mv/ssl-ftp-curl' (574d51b)
   1. "$MERGE_TOOLS_DIR/vimdiff"