Port git commit to C.
[git] / contrib / examples / git-merge-ours.sh
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-22  Thomas Harninggit-merge-ours: make it a builtin.