aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/examples/git-merge-ours.sh
AgeCommit message (Expand)AuthorFilesLines
2018-03-26Remove contrib/examples/*Ævar Arnfjörð Bjarmason1-14/+0
2007-11-28Merge branch 'maint'Junio C Hamano1-1/+1
2007-11-22git-merge-ours: make it a builtin.Thomas Harning1-0/+14