Merge branch 'sb/xdiff-remove-unused-static-decl' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:44 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:45 +0000 (13:51 -0700)
commit51673a7...e3a08d455ec6944f5aa233ea0b5d44df
treee44f3c6...4655f27b0f42db681399d4b28be25c3acopy hash to clipboard (tree)
parent294573e...d7acfc648d52a6f59cbe43db8847f836copy hash to clipboard (diff)
parent5e4e5bb...397b0d9f7257ed28b7dba6ee6ff278a8copy hash to clipboard (diff)