Merge branch 'tr/void-diff-setup-done'
commit9cd33bbc529bfa830c687d377433c46474d10e6a
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:52:26 +0000 (22 11:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:52:27 +0000 (22 11:52 -0700)
tree79268934569751906061421fcd5c46b751441c67
parent8d35c114579fd870feb61f3746e1371634fd2163
parent28452655af988094792483a51d188c58137760cd
Merge branch 'tr/void-diff-setup-done'

Remove unnecessary code.

* tr/void-diff-setup-done:
  diff_setup_done(): return void
builtin/blame.c
builtin/checkout.c
builtin/diff.c
builtin/merge.c
diff-no-index.c
diff.c
diff.h
merge-recursive.c
notes-merge.c
revision.c
submodule.c