diff options
| author |  Avery Pennarun <apenwarr@gmail.com> | 2009-11-25 21:23:59 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-17 22:46:28 -0800 |
| commit | e3cba962b172804ca1cab82801d94858154bd8cc (patch) | |
| tree | aba1ebfaaaf451032fd5d62e875afbc0db6b7bdd /Documentation/merge-options.txt | |
| parent | Make "subtree" part more orthogonal to the rest of merge-recursive. (diff) | |
| download | tgif-e3cba962b172804ca1cab82801d94858154bd8cc.tar.xz | |
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 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions