Merge branch 'vr/git-merge-default-to-upstream'

* vr/git-merge-default-to-upstream: Show error for 'git merge' with unset merge.defaultToUpstream

Junio C Hamano committed Dec 5, 2011 at 15:24 UTC ce8781e8ab66fb90fb7baf8d953a4582a06571a7

No changes.