diff options
| author | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-17 15:54:00 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-17 15:54:00 +0200 |
| commit | d4632454b6d7b6f3cc8c817f2f1f16f436272f3b (patch) | |
| tree | 4fe69bd48b70ebd478fe6a7405b47e3415b9f4a4 | |
| parent | 554429b9b1f39b09cfef8dc3654f806655547a2a (diff) | |
| download | werge-d4632454b6d7b6f3cc8c817f2f1f16f436272f3b.tar.gz werge-d4632454b6d7b6f3cc8c817f2f1f16f436272f3b.tar.bz2 | |
spaces
| -rw-r--r-- | README.md | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -144,15 +144,15 @@ automatically to `filename.werge-backup`. ``` werge -- blanks-friendly mergetool for tiny interdwindled changes -Usage: werge [(-F|--tok-filter FILTER) | (-i|--simple-tokens) | - (-I|--full-tokens)] [--no-zeal | (-z|--zeal)] - [-S|--space (keep|my|old|your)] - [-s | --resolve-space (normal|keep|my|old|your)] - [--conflict-space-overlaps] [--conflict-space-separate] - [--conflict-space-all] [-C|--expand-context N] - [--resolve (keep|my|old|your)] [--conflict-overlaps] - [--conflict-separate] [--conflict-all] [-G|--color] - [--label-start "<<<<<"] [--label-mo "|||||"] [--label-oy "====="] +Usage: werge [(-F|--tok-filter FILTER) | (-i|--simple-tokens) | + (-I|--full-tokens)] [--no-zeal | (-z|--zeal)] + [-S|--space (keep|my|old|your)] + [-s | --resolve-space (normal|keep|my|old|your)] + [--conflict-space-overlaps] [--conflict-space-separate] + [--conflict-space-all] [-C|--expand-context N] + [--resolve (keep|my|old|your)] [--conflict-overlaps] + [--conflict-separate] [--conflict-all] [-G|--color] + [--label-start "<<<<<"] [--label-mo "|||||"] [--label-oy "====="] [--label-end ">>>>>"] COMMAND Available options: |