diff options
| author | Mirek Kratochvil <exa.exa@gmail.com> | 2025-07-18 20:26:53 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <exa.exa@gmail.com> | 2025-07-18 20:26:53 +0200 |
| commit | 259ad6101b71e764459171122a3915ace74f6590 (patch) | |
| tree | d6cacf5feced6f3a864df404eee86bb8fb4112db /Opts.hs | |
| parent | f5f206765cf05f59b6482bca04a9913aef5330d5 (diff) | |
| download | werge-259ad6101b71e764459171122a3915ace74f6590.tar.gz werge-259ad6101b71e764459171122a3915ace74f6590.tar.bz2 | |
typo
Diffstat (limited to 'Opts.hs')
| -rw-r--r-- | Opts.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 <- |
