Merge branch 'sb/diff-cleanup' into maint
authorJunio C Hamano <redacted>
Mon, 19 Sep 2016 20:51:45 +0000 (13:51 -0700)
committerJunio C Hamano <redacted>
Mon, 19 Sep 2016 20:51:45 +0000 (13:51 -0700)
Code cleanup.

* sb/diff-cleanup:
  diff: remove dead code
  diff: omit found pointer from emit_callback
  diff.c: use diff_options directly


Trivial merge
git clone https://git.99rst.org/PROJECT