summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
AgeCommit message (Expand)AuthorFilesLines
2007-11-28Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-11-22git-merge-ours: make it a builtin.Libravatar Thomas Harning1-0/+14