mergetools / gvimdiff2on commit checkout: report upstream correctly even with loosely defined branch.*.merge (05e7368)
   1. "$MERGE_TOOLS_DIR/vimdiff"