![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Thu, 26 Nov 2009 02:23:59 +0000 (21:23 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Jan 2010 06:46:28 +0000 (22:46 -0800) | ||
| commit | e3cba962b172804ca1cab82801d94858154bd8cc | |
| tree | aba1ebfaaaf451032fd5d62e875afbc0db6b7bdd | tree | snapshot |
| parent | 85e51b783c3a92b42275442147e7a27e17d42276 | commit | diff |
Extend merge-subtree tests to test -Xsubtree=dir.
This tests the configurable -Xsubtree feature of merge-recursive.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This tests the configurable -Xsubtree feature of merge-recursive.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6029-merge-subtree.sh | diff | blob | history |