ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

README: Fix a typo (extraneous word)

Browse source
This commit is contained in:
Ilya Grigoriev 2023-11-23 13:24:27 -08:00
parent 5c3c0e9f6e
commit 07fda2cec1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -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