aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
Commit message (Expand)AuthorAge
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-09
|\
* | merge-ours: do not use cmd_*() as a subroutineJunio C Hamano2017-10-11
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22