mergetools / gvimdiff3on commit Merge branch 'ew/http-backend-batch-headers' (3787e3c)
   1. "$MERGE_TOOLS_DIR/vimdiff"