summaryrefslogtreecommitdiff
path: root/t/t4300-merge-tree.sh
Commit message (Expand)AuthorAgeFilesLines
* t4300: abstract away SHA-1-specific constantsbrian m. carlson2020-01-151-94/+94
* tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-211-27/+7
* merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-0/+51
* merge-tree: fix typo in "both changed identically"John Keeping2013-04-281-0/+13
* merge-tree: don't print entries that match "local"John Keeping2013-04-081-10/+0
* merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-2/+2
* merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-0/+44
* merge-tree: fix where two branches share no changesWill Palmer2010-07-141-3/+3
* add basic tests for merge-treeWill Palmer2010-07-141-0/+257