mergetools / gvimdiff2on commit Refactor type_from_string() to allow continuing after detecting an error (fe8e3b7)
   1. "$MERGE_TOOLS_DIR/vimdiff"