| commit | 5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Dec 2009 06:42:23 +0000 (8 22:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Dec 2009 06:42:23 +0000 (8 22:42 -0800) | ||
| tree | 3dd41869a6847564828ec508a356cec213b13a18 | treesnapshot (tar.gz zip) |
| parent | 389e0baa942c4548c5baa60541045b8900113378 | commitdiff |
| parent | e2ced7de19c85f3b246480bfacdcc934c98c08ca | commitdiff |
Merge branch 'mm/maint-merge-ff-error-message-fix' into maint
* mm/maint-merge-ff-error-message-fix:
builtin-merge: show user-friendly error messages for fast-forward too.
merge-recursive: make the error-message generation an extern function
Conflicts:
merge-recursive.c
* mm/maint-merge-ff-error-message-fix:
builtin-merge: show user-friendly error messages for fast-forward too.
merge-recursive: make the error-message generation an extern function
Conflicts:
merge-recursive.c
| builtin-merge.c | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |