Merge branch 'tl/userdiff-csharp-async'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15:00 -0700)
commite215e89...91b97ebb6831504480c8ab4734a2117e
treef6da72f...048c72f3458350f8faa8fbfa1339ff77copy hash to clipboard (tree)
parent9ecfd98...87cce0ad345c2dedf14f892d12c49abbcopy hash to clipboard (diff)
parenta12cec9...f8b64a0b99ae6f8a7e4724039406aea3copy hash to clipboard (diff)
userdiff.c