Browse Source

Merge branch 'ab/pickaxe-pcre2'

* ab/pickaxe-pcre2:
  diff: --pickaxe-all typofix
maint
Junio C Hamano 3 years ago
parent
commit
55194925e6
  1. 2
      diff.c

2
diff.c

@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options) @@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options)
die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"));

if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))
die(_("---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S"));
die(_("--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S"));

/*
* Most of the time we can say "there are changes"

Loading…
Cancel
Save