summaryrefslogtreecommitdiff
path: root/t/t4300-merge-tree.sh
AgeCommit message (Expand)AuthorFilesLines
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'Libravatar SZEDER Gábor1-27/+7
2013-05-06merge-tree: handle directory/empty conflict correctlyLibravatar John Keeping1-0/+51
2013-04-28merge-tree: fix typo in "both changed identically"Libravatar John Keeping1-0/+13
2013-04-08merge-tree: don't print entries that match "local"Libravatar John Keeping1-10/+0
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