mergetools / gvimdiff3on commit Merge branch 'ye/doc-http-proto' (ccca6b6)
   1. "$MERGE_TOOLS_DIR/vimdiff"