summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-22 11:14:24 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-22 11:15:06 +0900
commit14c0f8d3ab6c36672189cd2dd217f4617d12ccba (patch)
treef6ec4a7cc776afe11d405acfc7f191173622560e /xdiff-interface.c
parentMerge branch 'da/smerge' (diff)
downloadtgif-14c0f8d3ab6c36672189cd2dd217f4617d12ccba.tar.xz
The sixth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions