From 259ad6101b71e764459171122a3915ace74f6590 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Fri, 18 Jul 2025 20:26:53 +0200 Subject: [PATCH] typo --- Opts.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Opts.hs b/Opts.hs index 1c321aa..088d089 100644 --- a/Opts.hs +++ b/Opts.hs @@ -147,7 +147,7 @@ config = do <> metavar ("(normal|keep|my|old|your)") <> value SpaceNormal <> help - "Resolve conflicts in space-only tokens separately, and either keep unresolved conflicts, or resolve in favor of a given version; `normal' resolves the spaces together with other tokens, ignoring choices in --resolve-space-* (default: normal)" + "Resolve conflicts in space-only tokens separately, and either keep unresolved conflicts, or resolve in favor of a given version; `normal' resolves the spaces together with other tokens, ignoring choices in --conflict-space-* (default: normal)" ] cfgSpaceConflicts <- conflictMask "conflict-space" "space-only tokens" cfgContext <-