checkout_merged(): squelch false warning from some gcc

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 38570999c34f061524c3544892c53431db4f1623..ea03b9107eb2e85dd4a4c5ad93ac08dfe7e1c9f0 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -281,7 +281,7 @@ void diffcore_pickaxe(struct diff_options *o)
 {
        /* 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);
 }