diff: properly error out when combining multiple pickaxe options

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 72bb5a9514f3e806115d30cc669c7ab6855247fb..239ce5122b3a45bec211e0c20113385c0e37805d 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -251,7 +251,6 @@ void diffcore_pickaxe(struct diff_options *o)
                }
        }
 
-       /* Might want to warn when both S and G are on; I don't care... */
        pickaxe(&diff_queued_diff, o, regexp, kws,
                (opts & DIFF_PICKAXE_KIND_G) ? diff_grep : has_changes);