summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
Commit message (Expand)AuthorAgeFilesLines
* git-merge-ours: make it a builtin.Thomas Harning2007-11-221-0/+28