OSDN Git Service

Merge branch 'sb/diff-cleanup' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:45 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:45 +0000 (13:51 -0700)
commitddf8ee859f0f5f94e6b6350c1edc8bf8871ce31c
treee1b0d6180d02f965e4099067889e0136af952384
parent9f3d73e8cb2e9ae1123c218cc1ecff3032c82286
parentca9b37e5a8a76b7b5c9990481ce4f9894dd40392
Merge branch 'sb/diff-cleanup' into maint

Code cleanup.

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