mergetools / vimdiff2on commit http: add HTTP_KEEP_ERROR option (6d052d7)
   1. "$MERGE_TOOLS_DIR/vimdiff"