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 --cc diff.c
Simple merge