| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | merge-tree: handle directory/empty conflict correctly | John Keeping | 2013-05-06 |
| * | merge-tree: fix typo in "both changed identically" | John Keeping | 2013-04-28 |
| * | merge-tree: don't print entries that match "local" | John Keeping | 2013-04-08 |
| * | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 |
| * | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 |
| * | merge-tree: fix where two branches share no changes | Will Palmer | 2010-07-14 |
| * | add basic tests for merge-tree | Will Palmer | 2010-07-14 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |