From 07fda2cec16f0533b071d838707fe86decd16883 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Thu, 23 Nov 2023 13:24:27 -0800 Subject: [PATCH] README: Fix a typo (extraneous word) --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 20d39665d..a1a4a1ca0 100644 --- a/README.md +++ b/README.md @@ -61,12 +61,12 @@ systems into a single tool. Some of those sources of inspiration include: powerful and simple. Formatting output is done with a robust template language that can be configured by the user. -- **Pijul & Darcs**: Jujutsu keeps track of conflicts as [first-class objects][conflicts] - in its model; they are first-class in the same way commits are, while - alternatives like Git simply think of conflicts as textual diffs. While not - as rigorous as based systems like Darcs and Pijul (which are based on - a formalized theory of patches, as opposed to snapshots), the effect is - that many forms of conflict resolution can be performed and propagated +- **Pijul & Darcs**: Jujutsu keeps track of conflicts as [first-class + objects][conflicts] in its model; they are first-class in the same way commits + are, while alternatives like Git simply think of conflicts as textual diffs. + While not as rigorous as systems like Darcs and Pijul (which are based on a + formalized theory of patches, as opposed to snapshots), the effect is that + many forms of conflict resolution can be performed and propagated automatically. [perf]: https://github.com/martinvonz/jj/discussions/49