summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-03-24 08:44:55 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-27 08:45:47 -0700
commitae6a51f5a1c1bcc241543ee4da5cad4504bd8798 (patch)
tree148b9c8a48a681a2ce0a2ce3cd5c929f94734898 /xdiff/xmerge.c
parentt/helper: merge test-revision-walking into test-tool (diff)
downloadtgif-ae6a51f5a1c1bcc241543ee4da5cad4504bd8798.tar.xz
t/helper: merge test-run-command into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions