Show error for 'git merge' with unset merge.defaultToUpstream
authorVincent van Ravesteijn <vfr@lyx.org>
Mon, 21 Nov 2011 13:30:40 +0000 (14:30 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 17:29:06 +0000 (09:29 -0800)
commit5480207...4ee395fbb82682bc2065c93a43e24328
treee207d69...9d00b6caf08960f466f2f5a228f39ec9copy hash to clipboard (tree)
parentbd5bce7...bc55fa52277cc8a39f673c3e2dc60670copy hash to clipboard (diff)
builtin/merge.c