diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-08 22:42:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-08 22:42:23 -0800 |
| commit | 5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe (patch) | |
| tree | 3dd41869a6847564828ec508a356cec213b13a18 /t/t4131-apply-fake-ancestor.sh | |
| parent | Merge branch 'jn/maint-pull-rebase-error-message' into maint (diff) | |
| parent | builtin-merge: show user-friendly error messages for fast-forward too. (diff) | |
| download | tgif-5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe.tar.xz | |
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
Diffstat (limited to 't/t4131-apply-fake-ancestor.sh')
0 files changed, 0 insertions, 0 deletions