Merge branch 'tl/userdiff-csharp-async' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Mar 2018 21:13:39 +0000 (13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Mar 2018 21:13:39 +0000 (13:13 -0800)
commit6dcf76e...189e32b367ea053200d21aa31432517e
tree8525565...d9ad7addc987feaf134ffcb873bce736copy hash to clipboard (tree)
parent6ec749c...b7c1e55516526575da6254ffba6e4cbccopy hash to clipboard (diff)
parenta12cec9...f8b64a0b99ae6f8a7e4724039406aea3copy hash to clipboard (diff)
userdiff.c