From 6682b5ed37efd88d85c449976581484c933bbe87 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Tue, 23 Sep 2025 12:57:28 +0200 Subject: [PATCH] clean up readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 27fec8b..4c12478 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ I cannot do verses. ##### Token-merged version -This is produced with `werge merge my orig your` (conflicts on the space change +This is produced with `werge merge my old your` (conflicts on the space change that is too close to the disappearing "still" token): ``` Roses are red. @@ -88,7 +88,7 @@ I still cannot do verses. ``` ##### Mixing in unresolvable conflict -A harder-conflicting file (`theirs`): +A harder-conflicting file (`their`): ``` Roses are red. Violets are blue. @@ -96,7 +96,7 @@ Merging is quite hard. I cannot do verses. ``` -`werge merge mine orig theirs -s` highlights the actual unmergeable change: +`werge merge my old their -s` highlights the actual unmergeable change: ``` Roses are red. Violets are blue.