checkout: report upstream correctly even with loosely defined branch.*.merge
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"