mergetools / gvimdiff2on commit Merge branch 'bc/http-100-continue' (c5a77e8)
   1. "$MERGE_TOOLS_DIR/vimdiff"