Merge branch 'sb/diff-cleanup'
commita0d9b7f0154cb220743fa872998eb7728e1005e6
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2016 21:11:15 +0000 (15 14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2016 21:11:16 +0000 (15 14:11 -0700)
tree48120c3d7ec8592af6e36f45cb5e60b51dd37ce9
parentc13f458d869fefb603c63ae7bf65fe3d595a8a83
parentca9b37e5a8a76b7b5c9990481ce4f9894dd40392
Merge branch 'sb/diff-cleanup'

Code cleanup.

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