summaryrefslogtreecommitdiff
path: root/ppc
diff options
context:
space:
mode:
authorLibravatar Will Palmer <wmpalmer@gmail.com>2010-07-14 18:04:06 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-14 12:55:15 -0700
commitf32e9852d40e26da0c042ca35bf07fa456c9832b (patch)
tree905679971abe088a4b774f41977622201bc92c0c /ppc
parentgit fetch documentation: describe short '-p' synonym to '--prune' option (diff)
downloadtgif-f32e9852d40e26da0c042ca35bf07fa456c9832b.tar.xz
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>
Diffstat (limited to 'ppc')
0 files changed, 0 insertions, 0 deletions