![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Thu, 28 Feb 2008 12:36:54 +0000 (13:36 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Feb 2008 08:00:29 +0000 (00:00 -0800) | ||
| commit | 419e38337a4ff66ae2968756cc46c1bf77074814 | |
| tree | 253cb6290ab2f747dc96763752096f3b8cf15a65 | tree | snapshot |
| parent | 39fe578bdcc318308bc5d75efa04bd4bfc3a4f23 | commit | diff |
Improve t6029 to check the real "subtree" case
t6029 already checks if subtree available and works like recursive. This
patch adds code to test test the extra functionality the subtree merge
strategy provides.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t6029 already checks if subtree available and works like recursive. This
patch adds code to test test the extra functionality the subtree merge
strategy provides.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6029-merge-subtree.sh | diff | blob | history |