ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/demos
Martin von Zweigbergk bf64f89521 demos: update conflict-resolution demo with recent changes
Conflicts are now preserved in the working copy until their conflict
markers are gone (they used to be considered resolved).
2021-11-07 15:17:51 -08:00
..
demo_git_compat.sh demos: add a --fast mode to speed up recording 2021-10-23 14:21:15 -07:00
demo_helpers.sh demos: add a --fast mode to speed up recording 2021-10-23 14:21:15 -07:00
demo_helpers.tcl demos: add a --fast mode to speed up recording 2021-10-23 14:21:15 -07:00
demo_operation_log.sh demos: add some blank lines to separate groups of commands (and comments) 2021-10-27 16:55:59 -07:00
demo_resolve_conflict.sh demos: update conflict-resolution demo with recent changes 2021-11-07 15:17:51 -08:00
demo_working_copy.sh demos: add more jj log calls to the working-copy demo 2021-10-27 21:16:29 -07:00