![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 22:45:08 +0000 (14:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 22:45:08 +0000 (14:45 -0800) | ||
| commit | 045c05048530b8c57c410886e5f64d91a44c2c83 | |
| tree | ab68728e79a4e97bb16fe0bedbf9468daeaed585 | tree | snapshot |
| parent | 22c4e72d6eef8295a3311f6eb2f82a5494f8b88e | commit | diff |
| parent | e2ced7de19c85f3b246480bfacdcc934c98c08ca | commit | diff |
Merge branch 'mm/maint-merge-ff-error-message-fix'
Conflicts:
merge-recursive.c
Conflicts:
merge-recursive.c
| builtin-merge.c | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |