mergetools / vimdiff2on commit Merge branch 'dt/smart-http-detect-server-going-away' (d984592)
   1. "$MERGE_TOOLS_DIR/vimdiff"