aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/README.md b/README.md
index 9af114d..cb3f69b 100644
--- a/README.md
+++ b/README.md
@@ -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: