summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
AgeCommit message (Expand)Author
2007-11-22git-merge-ours: make it a builtin.Thomas Harning