summaryrefslogtreecommitdiffstats
path: root/builtin/merge-ours.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-1/+1
|\
* | merge-ours: do not use cmd_*() as a subroutineJunio C Hamano2017-10-111-9/+7
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+34