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

document difference

Browse source
This commit is contained in:
Mirek Kratochvil 2025-07-17 16:06:08 +02:00
parent d4632454b6
commit 69ad61ab22
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -79,9 +79,9 @@ I still cannot do verses.
- Some tokens are marked as spaces by the tokenizer, which allows the merge - Some tokens are marked as spaces by the tokenizer, which allows the merge
algorithm to be (selectively) more zealous when resolving conflicts on these. algorithm to be (selectively) more zealous when resolving conflicts on these.
This approach differs from various other structured-merge tools by being Compared to e.g. `difftastic`, `mergiraf` and similar tools, **`werge` is
completely oblivious about the file structure. Werge trades off some merge completely oblivious about the actual file structure** and works on any file
quality for (a lot of) complexity. type. This choice trades off some merge quality for (a lot of) complexity.
Tokenizers are simple, implementable as linear scanners that print separate Tokenizers are simple, implementable as linear scanners that print separate
tokens on individual lines that are prefixed with a space mark (`.` for space tokens on individual lines that are prefixed with a space mark (`.` for space