mergetools / gvimdiff3on commit Merge branch 'mh/http-urlmatch-cleanup' (f0fcab6)
   1. "$MERGE_TOOLS_DIR/vimdiff"