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

Code cleanup.

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