summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
AgeCommit message (Expand)AuthorFilesLines
2021-06-09builtins + test helpers: use return instead of exit() in cmd_*Libravatar Ævar Arnfjörð Bjarmason1-2/+2
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-11-12diff-lib.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-1/+1
2017-10-11merge-ours: do not use cmd_*() as a subroutineLibravatar Junio C Hamano1-9/+7
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+34