tree 253cb6290ab2f747dc96763752096f3b8cf15a65
parent 39fe578bdcc318308bc5d75efa04bd4bfc3a4f23
author Miklos Vajna <vmiklos@frugalware.org> 1204202214 +0100
committer Junio C Hamano <gitster@pobox.com> 1204272029 -0800

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>