Skip to content

Commit

Permalink
demos: redact one of the conflict outputs
Browse files Browse the repository at this point in the history
I would prefer to shorten it, but I ran into
jj-vcs#4239
  • Loading branch information
ilyagr committed Aug 8, 2024
1 parent abfb139 commit 48eadb8
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 66 deletions.
2 changes: 1 addition & 1 deletion demos/demo_juggle_conflicts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ run_command "jj diff -r second"
run_command "jj diff -r third"

comment "Let's reorder the second and third commits:"
run_command "jj rebase -s third -d first"
run_command_output_redacted "jj rebase -s third -d first"
run_command "jj rebase -s second -d third"
run_command "jj log"
comment "The commit labeled \"third\" has a conflict, as expected. What's more
Expand Down
Loading

0 comments on commit 48eadb8

Please sign in to comment.