Merge branch 'sb/xdiff-remove-unused-static-decl' into maint
commit51673a71e3a08d455ec6944f5aa233ea0b5d44df
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:44 +0000 (19 13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:45 +0000 (19 13:51 -0700)
treee44f3c6e4655f27b0f42db681399d4b28be25c3a
parent294573e6d7acfc648d52a6f59cbe43db8847f836
parent5e4e5bb5397b0d9f7257ed28b7dba6ee6ff278a8
Merge branch 'sb/xdiff-remove-unused-static-decl' into maint

Code cleanup.

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