6 commits

Author	SHA1	Message	Date
Ilya Grigoriev	5dab5e1ce6	demos: update, replace branch with bookmark ... The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.	2024-10-14 19:49:14 -07:00
Ilya Grigoriev	1cc10783a2	demos: update demos as little as possible to regenerate them ... This updates demos to the point where they can run without warnings. Some of them become less clear, this is addressed (where I noticed it) in follow-up commits. Fixes #3209	2024-09-05 17:33:46 -07:00
Ilya Grigoriev	25d65d0801	demos: changes related to the new default log revset ... We remove some branches that would be shown by default and remove `-r 'all()'` where it's no longer necessary.	2023-10-03 23:52:28 -07:00
Ilya Grigoriev	a70ea9dfdc	demos: rearrange and reword portions of demos ... This is mainly to account for the fact that most commands now report more information about the state of the repo.	2023-10-03 23:52:28 -07:00
Ilya Grigoriev	68b8069c5e	demos: redirect setup commands to /dev/null ... Previously, we needed to remove this manually from screenshots.	2023-10-03 23:52:28 -07:00
Ilya Grigoriev	438a4564b0	demos: rename demo_helpers.sh and demo_resolve_conflict.sh ... I think it's clearer if only the actual demos started with `demo_`, so I renamed `demo_helpers.sh` to just `helpers.sh`. `demo_resolve_conflict.sh` should match `resolve_conflicts.png` (with an s).	2023-10-03 23:52:28 -07:00

Renamed from demos/demo_resolve_conflict.sh (Browse further)