summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
AgeCommit message (Expand)AuthorFilesLines
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-1/+1
2017-10-11merge-ours: do not use cmd_*() as a subroutineLibravatar Junio C Hamano1-9/+7
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+34