Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Update merge help text to use generic terminology
Maximilian Roos06536029a247
diff --git a/docs/content/merge.md b/docs/content/merge.mdindex d3733a451..e7e53f2d3 100644--- a/docs/content/merge.md+++ b/docs/content/merge.md@@ -79,7 +79,7 @@ lint = "cargo clippy"## See also-- [wt step](@/step.md) — Run individual merge steps (commit, squash, rebase, push)+- [wt step](@/step.md) — Run individual operations (commit, squash, rebase, push)- [wt remove](@/remove.md) — Remove worktrees without merging- [wt switch](@/switch.md) — Navigate to other worktreesdiff --git a/src/cli.rs b/src/cli.rsindex d058bcd22..3d762488f 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -2557,7 +2557,7 @@ lint = "cargo clippy"## See also-- [wt step](@/step.md) — Run individual merge steps (commit, squash, rebase, push)+- [wt step](@/step.md) — Run individual operations (commit, squash, rebase, push)- [wt remove](@/remove.md) — Remove worktrees without merging- [wt switch](@/switch.md) — Navigate to other worktrees"#diff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snapindex 0903008f5..503bb06a0 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -11,6 +11,7 @@ info:GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.tomlWORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"---@@ -141,7 +142,7 @@ lint = "cargo clippy"## See also-- [wt step](@/step.md) — Run individual merge steps (commit, squash, rebase, push)+- [wt step](@/step.md) — Run individual operations (commit, squash, rebase, push)- [wt remove](@/remove.md) — Remove worktrees without merging- [wt switch](@/switch.md) — Navigate to other worktreesdiff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snapindex 68b2b522f..326d20750 100644--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap@@ -11,6 +11,7 @@ info:GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.tomlWORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"---@@ -130,6 +131,6 @@ hooks validate before merging — if they pass, the branch goes to the default b[32mSee also-- wt step — Run individual merge steps (commit, squash, rebase, push)+- wt step — Run individual operations (commit, squash, rebase, push)- wt remove — Remove worktrees without merging- wt switch — Navigate to other worktreesdiff --git a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap b/tests/snapshots/integration__integration_tests__help__help_page_merge.snapindex af9f33cad..a2a1f346d 100644--- a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_page_merge.snap@@ -11,6 +11,7 @@ info:GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.tomlWORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"---@@ -90,7 +91,7 @@ lint = "cargo clippy"## See also-- [wt step](@/step.md) — Run individual merge steps (commit, squash, rebase, push)+- [wt step](@/step.md) — Run individual operations (commit, squash, rebase, push)- [wt remove](@/remove.md) — Remove worktrees without merging- [wt switch](@/switch.md) — Navigate to other worktrees