summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dd15c7f)
raw | patch | inline | side by side (parent: dd15c7f)
author | Brandon Casey <drafnel@gmail.com> | |
Mon, 4 Oct 2010 22:51:48 +0000 (17:51 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 6 Oct 2010 20:45:18 +0000 (13:45 -0700) |
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-pickaxe.c | patch | blob | history |
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 38570999c34f061524c3544892c53431db4f1623..ea03b9107eb2e85dd4a4c5ad93ac08dfe7e1c9f0 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
{
/* Might want to warn when both S and G are on; I don't care... */
if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)
- return diffcore_pickaxe_grep(o);
+ diffcore_pickaxe_grep(o);
else
- return diffcore_pickaxe_count(o);
+ diffcore_pickaxe_count(o);
}