summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
AgeCommit message (Expand)AuthorFilesLines
2009-11-09Show usage string for 'git merge-ours -h'Libravatar Jonathan Nieder1-0/+6
2007-11-22git-merge-ours: make it a builtin.Libravatar Thomas Harning1-0/+28