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).
This commit is contained in:
Ilya Grigoriev 2023-08-28 15:42:44 -07:00
parent 2218143968
commit 438a4564b0
6 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
set -euo pipefail
. "$(dirname "$0")"/demo_helpers.sh
. "$(dirname "$0")"/helpers.sh
new_tmp_dir

View File

@ -1,6 +1,6 @@
#!/bin/bash
set -euo pipefail
. "$(dirname "$0")"/demo_helpers.sh
. "$(dirname "$0")"/helpers.sh
new_tmp_dir
jj init --config-toml ui.allow-init-native=true

View File

@ -1,6 +1,6 @@
#!/bin/bash
set -euo pipefail
. "$(dirname "$0")"/demo_helpers.sh
. "$(dirname "$0")"/helpers.sh
new_tmp_dir
jj git clone https://github.com/octocat/Hello-World

View File

@ -1,6 +1,6 @@
#!/bin/bash
set -euo pipefail
. "$(dirname "$0")"/demo_helpers.sh
. "$(dirname "$0")"/helpers.sh
new_tmp_dir
jj git clone https://github.com/octocat/Hello-World

View File

@ -1,6 +1,6 @@
#!/bin/bash
set -euo pipefail
. "$(dirname "$0")"/demo_helpers.sh
. "$(dirname "$0")"/helpers.sh
new_tmp_dir
jj git clone https://github.com/octocat/Hello-World