From 802125aa3c4d1e8930d6bc366e279cd74caba012 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Wed, 31 Aug 2022 19:45:51 -0700 Subject: [PATCH] Reword paragraph about jj and other VCS in README Fixes two pedantic issues with this paragraph: * "either" describing more than two things * I am not an expert, but I suspect that Pijul supports "automatic rebase". --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da2ac85c8..a17f2461c 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ features from Git (data model, [speed](https://github.com/martinvonz/jj/discussions/49)), Mercurial (anonymous branching, simple CLI [free from "the index"](docs/git-comparison.md#the-index), [revsets](docs/revsets.md), powerful history-rewriting), and Pijul/Darcs -([first-class conflicts](docs/conflicts.md)), with features not found in either +([first-class conflicts](docs/conflicts.md)), with features not found in most of them ([working-copy-as-a-commit](docs/working-copy.md), [undo functionality](docs/operation-log.md), automatic rebase, [safe replication via `rsync`, Dropbox, or distributed file