mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 05:45:30 +03:00
README: Fix a typo (extraneous word)
This commit is contained in:
parent
5c3c0e9f6e
commit
07fda2cec1
12
README.md
12
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
|
powerful and simple. Formatting output is done with a robust template language
|
||||||
that can be configured by the user.
|
that can be configured by the user.
|
||||||
|
|
||||||
- **Pijul & Darcs**: Jujutsu keeps track of conflicts as [first-class objects][conflicts]
|
- **Pijul & Darcs**: Jujutsu keeps track of conflicts as [first-class
|
||||||
in its model; they are first-class in the same way commits are, while
|
objects][conflicts] in its model; they are first-class in the same way commits
|
||||||
alternatives like Git simply think of conflicts as textual diffs. While not
|
are, while alternatives like Git simply think of conflicts as textual diffs.
|
||||||
as rigorous as based systems like Darcs and Pijul (which are based on
|
While not as rigorous as systems like Darcs and Pijul (which are based on a
|
||||||
a formalized theory of patches, as opposed to snapshots), the effect is
|
formalized theory of patches, as opposed to snapshots), the effect is that
|
||||||
that many forms of conflict resolution can be performed and propagated
|
many forms of conflict resolution can be performed and propagated
|
||||||
automatically.
|
automatically.
|
||||||
|
|
||||||
[perf]: https://github.com/martinvonz/jj/discussions/49
|
[perf]: https://github.com/martinvonz/jj/discussions/49
|
||||||
|
Loading…
Reference in New Issue
Block a user