summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
Commit message (Expand)AuthorAgeFilesLines
* builtins + test helpers: use return instead of exit() in cmd_*Ævar Arnfjörð Bjarmason2021-06-091-2/+2
* cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
* diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-1/+1
|\
* | 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