Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2012-12-26 | merge-tree: fix d/f conflicts | Junio C Hamano | 1 | -2/+2 |
2012-12-26 | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 1 | -0/+44 |
2010-07-14 | merge-tree: fix where two branches share no changes | Will Palmer | 1 | -3/+3 |
2010-07-14 | add basic tests for merge-tree | Will Palmer | 1 | -0/+257 |