Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
commit738c2187604756fea3901554a49f9137e02ed0ef
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:40 +0000 (11 10:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:40 +0000 (11 10:53 -0700)
treeac786621832f1ac568761e96989ca984a836530e
parent3f835949e9b800619136f2511e84000c95916d6e
parent28452655af988094792483a51d188c58137760cd
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

* tr/void-diff-setup-done:
  diff_setup_done(): return void
12 files changed:
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
tree-diff.c