diff options
| author | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-17 16:06:08 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-17 16:06:08 +0200 |
| commit | 69ad61ab22a957235746d0bef89eea72d46de8f9 (patch) | |
| tree | 0407a24439ba67de1792231a03c51c56e31beb28 /README.md | |
| parent | d4632454b6d7b6f3cc8c817f2f1f16f436272f3b (diff) | |
| download | werge-69ad61ab22a957235746d0bef89eea72d46de8f9.tar.gz werge-69ad61ab22a957235746d0bef89eea72d46de8f9.tar.bz2 | |
document difference
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -79,9 +79,9 @@ I still cannot do verses. - Some tokens are marked as spaces by the tokenizer, which allows the merge algorithm to be (selectively) more zealous when resolving conflicts on these. -This approach differs from various other structured-merge tools by being -completely oblivious about the file structure. Werge trades off some merge -quality for (a lot of) complexity. +Compared to e.g. `difftastic`, `mergiraf` and similar tools, **`werge` is +completely oblivious about the actual file structure** and works on any file +type. This choice trades off some merge quality for (a lot of) complexity. Tokenizers are simple, implementable as linear scanners that print separate tokens on individual lines that are prefixed with a space mark (`.` for space |