mergetools / gvimdiff2on commit Merge branch 'sp/smart-http-content-type-check' (271cd23)
   1. "$MERGE_TOOLS_DIR/vimdiff"