diff options
| author | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-09-23 12:57:28 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-09-23 12:57:28 +0200 |
| commit | 6682b5ed37efd88d85c449976581484c933bbe87 (patch) | |
| tree | 807b516837ed1fc0dfbdf9c731557239581aa396 | |
| parent | 6cdd70feafe7b8047c38ac1e4f5d6fa9ffe97f28 (diff) | |
| download | werge-6682b5ed37efd88d85c449976581484c933bbe87.tar.gz werge-6682b5ed37efd88d85c449976581484c933bbe87.tar.bz2 | |
clean up readme
| -rw-r--r-- | README.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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. |