| commit | f32e9852d40e26da0c042ca35bf07fa456c9832b | |
| author | Will Palmer <wmpalmer@gmail.com> | |
| Wed, 14 Jul 2010 17:04:06 +0000 (14 18:04 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Jul 2010 19:55:15 +0000 (14 12:55 -0700) | ||
| tree | 905679971abe088a4b774f41977622201bc92c0c | treesnapshot (tar.gz zip) |
| parent | 1b79d1c2a8a90419238f7213870ab1dc465082fe | commitdiff |
add basic tests for merge-tree
merge-tree had no test cases, so here we add some very basic tests for
it, including some known-breakages.
[jc: with obvious/trivial fixups]
Signed-off-by: Will Palmer <wmpalmer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-tree had no test cases, so here we add some very basic tests for
it, including some known-breakages.
[jc: with obvious/trivial fixups]
Signed-off-by: Will Palmer <wmpalmer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t4300-merge-tree.sh | [new file with mode: 0755] | blob |