mergetools / vimdiff2on commit branch: die on config error when unsetting upstream (b81842c)
   1. "$MERGE_TOOLS_DIR/vimdiff"