projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 39fe578) | patch
Improve t6029 to check the real "subtree" case
authorMiklos Vajna <vmiklos@frugalware.org>
Thu, 28 Feb 2008 12:36:54 +0000 (13:36 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Feb 2008 08:00:29 +0000 (00:00 -0800)
commit419e38337a4ff66ae2968756cc46c1bf77074814
tree253cb6290ab2f747dc96763752096f3b8cf15a65tree | snapshot
parent39fe578bdcc318308bc5d75efa04bd4bfc3a4f23commit | 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>
t/t6029-merge-subtree.sh diff | blob | history
Git—the stupid content tracker