summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
AgeCommit message (Expand)AuthorFilesLines
2007-11-22git-merge-ours: make it a builtin.Libravatar Thomas Harning1-0/+28
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 12:36:34 +0000