diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-23 11:08:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-23 11:14:56 -0800 |
| commit | 1736855c9b59ac787af979a44840a58361cbaf66 (patch) | |
| tree | f7193190c01e6c995dcdeecee8c7270183f34c45 /diff.h | |
| parent | checkout: updates to tracking report (diff) | |
| download | tgif-1736855c9b59ac787af979a44840a58361cbaf66.tar.xz | |
Add merge-subtree back
An earlier commit e1b3a2c (Build-in merge-recursive) made the
subtree merge strategy backend unavailable. This resurrects
it.
A new test t6029 currently only tests the strategy is available,
but it should be enhanced to check the real "subtree" case.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions