| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Show usage string for 'git merge-ours -h' | Jonathan Nieder | 2009-11-09 | 1 | -0/+6 |
| * | git-merge-ours: make it a builtin. | Thomas Harning | 2007-11-22 | 1 | -0/+28 |
 |
index : rhi/git | |
| Roland Hieber |
| summaryrefslogtreecommitdiffstats |
path: root/builtin-merge-ours.c