Merge branch 'sb/xdiff-remove-unused-static-decl'
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2016 22:34:38 +0000 (15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2016 22:34:38 +0000 (15:34 -0700)
Code cleanup.

* sb/xdiff-remove-unused-static-decl:
xdiff: remove unneeded declarations

Trivial merge