mergetools / gvimdiff3on commit Merge branch 'jk/http-walker-limit-redirect' (da72ee8)
   1. "$MERGE_TOOLS_DIR/vimdiff"