diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-08-06 22:52:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-08-06 22:52:15 +0300 |
commit | 55194925e62b34a3f62b31034f73a6bcfb063bc5 (patch) | |
tree | db86a6c5de9d68e953dc21af9c04aa530dc556bb | |
parent | c87977a0c58c67dea22e1cb50e429e2122b037b9 (diff) | |
parent | 11c649b8911eb641a41169957dba525efe50eaa0 (diff) |
Merge branch 'ab/pickaxe-pcre2'
* ab/pickaxe-pcre2:
diff: --pickaxe-all typofix
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |