Age | Commit message (Expand) | Author |
---|---|---|
2018-08-21 | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' | SZEDER Gábor |
2013-05-07 | merge-tree: handle directory/empty conflict correctly | John Keeping |
2013-04-28 | merge-tree: fix typo in "both changed identically" | John Keeping |
2013-04-08 | merge-tree: don't print entries that match "local" | John Keeping |
2012-12-27 | merge-tree: fix d/f conflicts | Junio C Hamano |
2012-12-27 | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano |
2010-07-14 | merge-tree: fix where two branches share no changes | Will Palmer |
2010-07-14 | add basic tests for merge-tree | Will Palmer |