summaryrefslogtreecommitdiff
path: root/t/t4300-merge-tree.sh
AgeCommit message (Expand)AuthorFilesLines
2012-12-26merge-tree: fix d/f conflictsLibravatar Junio C Hamano1-2/+2
2012-12-26merge-tree: add comments to clarify what these functions are doingLibravatar Junio C Hamano1-0/+44
2010-07-14merge-tree: fix where two branches share no changesLibravatar Will Palmer1-3/+3
2010-07-14add basic tests for merge-treeLibravatar Will Palmer1-0/+257