summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2007-11-281-1/+1
* git-merge-ours: make it a builtin.Thomas Harning2007-11-221-0/+14