diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2009-11-26 03:23:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 07:46:28 +0100 |
| commit | e3cba962b172804ca1cab82801d94858154bd8cc (patch) | |
| tree | aba1ebfaaaf451032fd5d62e875afbc0db6b7bdd /t/t1504-ceiling-dirs.sh | |
| parent | Make "subtree" part more orthogonal to the rest of merge-recursive. (diff) | |
| download | git-e3cba962b172804ca1cab82801d94858154bd8cc.tar.xz git-e3cba962b172804ca1cab82801d94858154bd8cc.zip | |
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>
Diffstat (limited to 't/t1504-ceiling-dirs.sh')
0 files changed, 0 insertions, 0 deletions