mergetools / vimdiff2on commit Merge branch 'bn/http-cookiefile-config' (459000e)
   1. "$MERGE_TOOLS_DIR/vimdiff"