summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
AgeCommit message (Expand)Author
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds
2009-11-10Show usage string for 'git merge-ours -h'Jonathan Nieder
2007-11-22git-merge-ours: make it a builtin.Thomas Harning