aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2007-11-28
* git-merge-ours: make it a builtin.Thomas Harning2007-11-22