summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Benoit Pierre <benoit.pierre@gmail.com>2014-03-18 11:00:56 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-18 11:26:12 -0700
commitb549be0da7ff9075c0b3de14c1d5d03583ca8d2d (patch)
tree4105ad5d5b55b9c5292fbc011db3f1b8ddffce88 /builtin/merge.c
parentmerge hook tests: fix and update tests (diff)
downloadtgif-b549be0da7ff9075c0b3de14c1d5d03583ca8d2d.tar.xz
run-command: mark run_hook_with_custom_index as deprecated
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions