![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Jan 2011 19:56:16 +0000 (11:56 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Jan 2011 20:14:55 +0000 (12:14 -0800) | ||
| commit | 63d9aad326986f3c89285282ff7daf0c9bfa8c96 | |
| tree | f55cd5d9eacf1ede9ca222f2038535aad4e5ad4f | tree | snapshot |
| parent | b45720b0efc2b9389412988e67ce9f7debffa8b1 | commit | diff |
Fix mismerge at 37ef456
Two tests have been lost and I do not know why...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Two tests have been lost and I do not know why...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3032-merge-recursive-options.sh | diff | blob | history |