summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-10-16 16:21:17 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-16 16:21:17 +0900
commita4b8ab5363a32f283a61ef3a962853556d136c0e (patch)
tree17dc6f7b3c626f3e5ff583ac9b4e160535733ed3 /builtin/merge-file.c
parentMerge branch 'sf/complete-stash-list' (diff)
downloadtgif-a4b8ab5363a32f283a61ef3a962853556d136c0e.tar.xz
Fourth batch for 2.20
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions