summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
AgeCommit message (Expand)Author
2007-11-29Merge branch 'maint'Junio C Hamano
2007-11-22git-merge-ours: make it a builtin.Thomas Harning