![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:24:12 +0000 (15:24 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:24:14 +0000 (15:24 -0800) |
* vr/git-merge-default-to-upstream:
Show error for 'git merge' with unset merge.defaultToUpstream
Show error for 'git merge' with unset merge.defaultToUpstream
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/merge.c
Simple merge