mergetools / gvimdiff3on commit Merge branch 'jk/http-errors' (2075a0c)
   1. "$MERGE_TOOLS_DIR/vimdiff"