summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Emily Shaffer <emilyshaffer@google.com>2021-12-22 04:59:33 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-07 15:19:34 -0800
commit432a50bebf45e7d3be2677426aa57f7ab35f83da (patch)
treee159fca3575eb3426f6d07009bd2261653d921a1 /merge.c
parentrebase: convert pre-rebase to use hook.h (diff)
downloadtgif-432a50bebf45e7d3be2677426aa57f7ab35f83da.tar.xz
am: convert applypatch-msg to use hook.h
Teach applypatch-msg to use the hook.h library instead of the run-command.h library. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions