summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-01-23 13:21:10 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-23 13:21:10 -0800
commit5be1f00a9a701532232f57958efab4be8c959a29 (patch)
tree8ccb7d4fa49449a843b00aca64baf99feb10e2ab /mergetools
parentMerge branch 'nd/add-i-ignore-submodules' (diff)
downloadtgif-5be1f00a9a701532232f57958efab4be8c959a29.tar.xz
First batch after 2.16
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions