summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
Commit message (Expand)AuthorAgeFilesLines
* merge-ours: do not use cmd_*() as a subroutinejc/no-cmd-as-subroutineJunio C Hamano2017-10-111-9/+7
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+34