summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-25 16:07:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-25 16:07:01 -0700
commit63ec2297d26155adb0e38745bf2284cd663add8e (patch)
treea901f22a8441e07116908d22aa4c36aa95decfa2 /builtin/merge.c
parentMerge branch 'ab/pkt-line-cleanup' (diff)
parentdoc lint: make "lint-docs" non-.PHONY (diff)
downloadtgif-63ec2297d26155adb0e38745bf2284cd663add8e.tar.xz
Merge branch 'ab/fix-make-lint-docs'
Build fix. * ab/fix-make-lint-docs: doc lint: make "lint-docs" non-.PHONY doc build: speed up "make lint-docs" doc lint: emit errors on STDERR doc lint: fix error-hiding regression
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions