| commit | 1736855c9b59ac787af979a44840a58361cbaf66 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 Feb 2008 19:08:25 +0000 (23 11:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 Feb 2008 19:14:56 +0000 (23 11:14 -0800) | ||
| tree | f7193190c01e6c995dcdeecee8c7270183f34c45 | treesnapshot (tar.gz zip) |
| parent | b56fca07d2bac20339d59218ab98de38a9363e77 | commitdiff |
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>
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>
| Makefile | diffblobblamehistory | |
| git.c | diffblobblamehistory | |
| t/t6029-merge-subtree.sh | [new file with mode: 0755] | blob |