summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
AgeCommit message (Expand)Author
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano
2017-10-11merge-ours: do not use cmd_*() as a subroutineJunio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds