summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
Commit message (Expand)AuthorAgeFilesLines
* Show usage string for 'git merge-ours -h'Jonathan Nieder2009-11-091-0/+6
* git-merge-ours: make it a builtin.Thomas Harning2007-11-221-0/+28