path: root/t/
AgeCommit message (Expand)Author
2020-01-15t4300: abstract away SHA-1-specific constantsbrian m. carlson
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor
2013-05-07merge-tree: handle directory/empty conflict correctlyJohn Keeping
2013-04-28merge-tree: fix typo in "both changed identically"John Keeping
2013-04-08merge-tree: don't print entries that match "local"John Keeping
2012-12-26merge-tree: fix d/f conflictsJunio C Hamano
2012-12-26merge-tree: add comments to clarify what these functions are doingJunio C Hamano
2010-07-14merge-tree: fix where two branches share no changesWill Palmer
2010-07-14add basic tests for merge-treeWill Palmer