Merge branch 'vr/git-merge-default-to-upstream'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:24:12 +0000 (15:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:24:14 +0000 (15:24 -0800)
commitce8781e8ab66fb90fb7baf8d953a4582a06571a7
tree85d3248a398a4549dc8ca8d00ad36bf94bdf4a6c
parentcddec4f8aea4809131dc1b1765d6c8e2a498a58e
parent5480207c4ee395fbb82682bc2065c93a43e24328
Merge branch 'vr/git-merge-default-to-upstream'

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