exa/werge
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

spaces

Browse source
This commit is contained in:
Mirek Kratochvil 2025-07-17 15:54:00 +02:00
parent 554429b9b1
commit d4632454b6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
README.md
View file

@ -144,15 +144,15 @@ automatically to `filename.werge-backup`.
``` ```
werge -- blanks-friendly mergetool for tiny interdwindled changes werge -- blanks-friendly mergetool for tiny interdwindled changes
Usage: werge [(-F|--tok-filter FILTER) | (-i|--simple-tokens) | Usage: werge [(-F|--tok-filter FILTER) | (-i|--simple-tokens) |
(-I|--full-tokens)] [--no-zeal | (-z|--zeal)] (-I|--full-tokens)] [--no-zeal | (-z|--zeal)]
[-S|--space (keep|my|old|your)] [-S|--space (keep|my|old|your)]
[-s | --resolve-space (normal|keep|my|old|your)] [-s | --resolve-space (normal|keep|my|old|your)]
[--conflict-space-overlaps] [--conflict-space-separate] [--conflict-space-overlaps] [--conflict-space-separate]
[--conflict-space-all] [-C|--expand-context N] [--conflict-space-all] [-C|--expand-context N]
[--resolve (keep|my|old|your)] [--conflict-overlaps] [--resolve (keep|my|old|your)] [--conflict-overlaps]
[--conflict-separate] [--conflict-all] [-G|--color] [--conflict-separate] [--conflict-all] [-G|--color]
[--label-start "<<<<<"] [--label-mo "|||||"] [--label-oy "====="] [--label-start "<<<<<"] [--label-mo "|||||"] [--label-oy "====="]
[--label-end ">>>>>"] COMMAND [--label-end ">>>>>"] COMMAND
Available options: Available options: