Added merge.defaultToUpstream.