| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-tree: handle directory/empty conflict correctly | John Keeping | 2013-05-06 | 1 | -0/+51 |
| * | merge-tree: fix typo in "both changed identically" | John Keeping | 2013-04-28 | 1 | -0/+13 |
| * | merge-tree: don't print entries that match "local" | John Keeping | 2013-04-08 | 1 | -10/+0 |
| * | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 | 1 | -2/+2 |
| * | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 | 1 | -0/+44 |
| * | merge-tree: fix where two branches share no changes | Will Palmer | 2010-07-14 | 1 | -3/+3 |
| * | add basic tests for merge-tree | Will Palmer | 2010-07-14 | 1 | -0/+257 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |