From 0c8c33df7337ecc28f6a51587800bad885037eee Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Sun, 2 Oct 2022 21:21:27 -0700 Subject: [PATCH] readme: update asciinema links As @huyz noticed, I accidentally lost the undo demo in 0d1bf7cb3b7e. I also didn't update the working-copy demo. This patch fixes that by updating all demos, so we also get the recent styling change from af145c998ea4.. --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 48bf102d5e..fe6391e079 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ backend (the only minor reason might be The backend exists mainly to make sure that it's possible to eventually add functionality that cannot easily be added to the Git backend. - - + + ### The working copy is automatically committed @@ -64,8 +64,8 @@ working copy or any other commit. It also means that you can always check out a different commit without first explicitly committing the working copy changes (you can even check out a different commit while resolving merge conflicts). - - + + ### Operations update the repo first, then possibly the working copy @@ -81,8 +81,8 @@ the repo state after the operation. This means that you can easily revert to an earlier repo state, or to simply undo a particular operation (which does not necessarily have to be the most recent operation). - - + + ### Conflicts can be recorded in commits @@ -95,13 +95,13 @@ resolving conflicts, regardless of which command caused them. This design also lets Jujutsu rebase merge commits correctly (unlike both Git and Mercurial). Basic conflict resolution: - - + + Juggling conflicts: - - + + ### Automatic rebase