| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 |
| * | Show usage string for 'git merge-ours -h' | Jonathan Nieder | 2009-11-09 |
| * | git-merge-ours: make it a builtin. | Thomas Harning | 2007-11-22 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/builtin-merge-ours.c