Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Remove leading indentation from CLI output
Maximilian Roos1cf656c982de
diff --git a/src/commands/config.rs b/src/commands/config.rsindex f35b2c01a..2f1ec8f0b 100644--- a/src/commands/config.rs+++ b/src/commands/config.rs@@ -40,7 +40,7 @@ pub fn handle_config_init() -> Result<(), GitError> {// Success messagelet bold = AnstyleStyle::new().bold();println!("{SUCCESS_EMOJI} {GREEN}Created config file{GREEN:#}");- println!(" {bold}{}{bold:#}", config_path.display());+ println!("{bold}{}{bold:#}", config_path.display());println!();println!("{HINT_EMOJI} {HINT}Edit this file to customize worktree paths and LLM settings{HINT:#}"@@ -74,11 +74,11 @@ fn display_global_config() -> Result<(), GitError> {// Check if file existsif !config_path.exists() {- println!(" {HINT_EMOJI} {HINT}Not found (using defaults){HINT:#}");- println!(" {HINT_EMOJI} {HINT}Run 'wt config init' to create a config file{HINT:#}");+ println!("{HINT_EMOJI} {HINT}Not found (using defaults){HINT:#}");+ println!("{HINT_EMOJI} {HINT}Run 'wt config init' to create a config file{HINT:#}");println!();- println!(" {dim}# Default configuration:{dim:#}");- println!(" {dim}worktree-path = \"../{{repo}}.{{branch}}\"{dim:#}");+ println!("{dim}# Default configuration:{dim:#}");+ println!("{dim}worktree-path = \"../{{repo}}.{{branch}}\"{dim:#}");return Ok(());}@@ -87,7 +87,7 @@ fn display_global_config() -> Result<(), GitError> {.map_err(|e| GitError::CommandFailed(format!("Failed to read config file: {}", e)))?;if contents.trim().is_empty() {- println!(" {HINT_EMOJI} {HINT}Empty file (using defaults){HINT:#}");+ println!("{HINT_EMOJI} {HINT}Empty file (using defaults){HINT:#}");return Ok(());}@@ -116,7 +116,7 @@ fn display_project_config() -> Result<(), GitError> {// Check if file existsif !config_path.exists() {- println!(" {HINT_EMOJI} {HINT}Not found{HINT:#}");+ println!("{HINT_EMOJI} {HINT}Not found{HINT:#}");return Ok(());}@@ -125,7 +125,7 @@ fn display_project_config() -> Result<(), GitError> {.map_err(|e| GitError::CommandFailed(format!("Failed to read config file: {}", e)))?;if contents.trim().is_empty() {- println!(" {HINT_EMOJI} {HINT}Empty file{HINT:#}");+ println!("{HINT_EMOJI} {HINT}Empty file{HINT:#}");return Ok(());}diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex c85f0fa78..0fb962af2 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -144,20 +144,20 @@ fn format_merge_summary(// Show what was mergedoutput.push_str(&format!(- " {dim}Merged: {bold}{from_branch}{bold:#} → {bold}{to_branch}{bold:#}{dim:#}\n"+ "{dim}Merged: {bold}{from_branch}{bold:#} → {bold}{to_branch}{bold:#}{dim:#}\n"));// Show squash info if applicableif let Some(count) = squashed_count {- output.push_str(&format!(" {dim}Squashed: {count} commits into 1{dim:#}\n"));+ output.push_str(&format!("{dim}Squashed: {count} commits into 1{dim:#}\n"));}// Show worktree statusif cleaned_up {- output.push_str(&format!(" {dim}Worktree: Removed{dim:#}"));+ output.push_str(&format!("{dim}Worktree: Removed{dim:#}"));} else {output.push_str(&format!(- " {dim}Worktree: Kept (use 'wt remove' to clean up){dim:#}"+ "{dim}Worktree: Kept (use 'wt remove' to clean up){dim:#}"));}@@ -378,7 +378,7 @@ fn run_pre_merge_checks(name = prepared.name,);eprintln!();- eprintln!(" {e}");+ eprintln!("{e}");eprintln!();eprintln!("{HINT_EMOJI} {HINT}Use --no-verify to skip pre-merge checks{HINT:#}");return Err(GitError::CommandFailed(String::new()));diff --git a/tests/snapshots/integration__integration_tests__config_list__config_list_no_project.snap b/tests/snapshots/integration__integration_tests__config_list__config_list_no_project.snapindex 01b951818..7e558331b 100644--- a/tests/snapshots/integration__integration_tests__config_list__config_list_no_project.snap+++ b/tests/snapshots/integration__integration_tests__config_list__config_list_no_project.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/config_list.rs-assertion_line: 94info:program: wtargs:@@ -13,10 +12,11 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpROELyU+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg8SPRYLANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1704067200"+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5FApx5/test-config.toml---success: trueexit_code: 0@@ -25,6 +25,6 @@ Global Config: [1m[TEMP_HOME]/.config/worktrunk/config.toml[0m[40m [0m worktree-path = [32m"../{main-worktree}.{branch}"[0mProject Config: [1m[REPO]/.config/wt.toml[0m- 💡 [2mNot found[0m+💡 [2mNot found[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snapindex ddee76395..054b121db 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap differdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 54013636a..95d53759a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap@@ -18,7 +18,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpACtZUm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIBhHZn/test-config.toml---success: trueexit_code: 0@@ -51,8 +51,8 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mSquashed: 3 commits into 1[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mSquashed: 3 commits into 1[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex d1fad736b..eecb9a0ad 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIMSvd2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7OWni2/test-config.toml---success: trueexit_code: 0@@ -39,7 +39,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex c86a5ca94..a7cdd3b3a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap@@ -17,7 +17,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2ejS0J/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5PPbYD/test-config.toml---success: trueexit_code: 0@@ -41,7 +41,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snapindex 5298e7711..12f3911b3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap@@ -19,7 +19,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "feat: complete user dashboard"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPijZbQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTeQhy0/test-config.toml---success: trueexit_code: 0@@ -43,7 +43,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex a911cc632..06ea450f7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/merge.rs-assertion_line: 11info:program: wtargs:@@ -15,7 +14,8 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1704067200"+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBRsNQk/test-config.toml---success: trueexit_code: 0@@ -34,7 +34,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 23a789ac4..df8dd2850 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/merge.rs-assertion_line: 11info:program: wtargs:@@ -15,7 +14,8 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1704067200"+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqLkyNu/test-config.toml---success: trueexit_code: 0@@ -34,7 +34,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snapindex eb524838b..309d6e35e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBzUvkE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTsXvBu/test-config.toml---success: falseexit_code: 1@@ -28,6 +28,6 @@ exit_code: 1❌ [31mPre-merge check failed: [1m[31mcmd[0m[0m- Command failed with exit code: exit status: 1+Command failed with exit code: exit status: 1💡 [2mUse --no-verify to skip pre-merge checks[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snapindex 807079676..0484155d4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYOJsjk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSxUKB4/test-config.toml---success: trueexit_code: 0@@ -35,8 +35,8 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----🔄 [36mRunning pre-merge check 'format':[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snapindex 39842d202..05193b884 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/merge.rs-assertion_line: 11info:program: wtargs:@@ -16,7 +15,8 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1704067200"+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYlXsLe/test-config.toml---success: trueexit_code: 0@@ -35,7 +35,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snapindex 33b9c24bf..da4d89e2b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAbfvJx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbslIr3/test-config.toml---success: trueexit_code: 0@@ -35,8 +35,8 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----🔄 [36mRunning pre-merge check 'cmd':[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 38e817906..a7121d209 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsZKkrc/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUzP4Z8/test-config.toml---success: trueexit_code: 0@@ -46,8 +46,8 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mSquashed: 3 commits into 1[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mSquashed: 3 commits into 1[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex 6043f0f29..d31501aa7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -17,7 +17,7 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfuanLT/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpifaOZL/test-config.toml---success: trueexit_code: 0@@ -45,8 +45,8 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mSquashed: 2 commits into 1[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mSquashed: 2 commits into 1[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex d066c628c..a71623d21 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/merge.rs-assertion_line: 11info:program: wtargs:@@ -16,7 +15,8 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1704067200"+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpohLiUi/test-config.toml---success: trueexit_code: 0@@ -36,7 +36,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex 8fbd6533d..a3d9c4241 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -19,7 +19,7 @@ info:WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"WORKTRUNK_COMMIT_GENERATION__COMMAND: sh- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxmoIBS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7NtF6R/test-config.toml---success: trueexit_code: 0@@ -46,8 +46,8 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mSquashed: 2 commits into 1[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mSquashed: 2 commits into 1[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 151c2d629..e89297c3e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/merge.rs-assertion_line: 11info:program: wtargs:@@ -14,7 +13,8 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1704067200"+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFYE39t/test-config.toml---success: trueexit_code: 0@@ -33,7 +33,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Removed[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Removed[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex 170b8f8ac..8a2e942e4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -15,7 +15,8 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1704067200"+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd2leRQ/test-config.toml---success: trueexit_code: 0@@ -32,7 +33,7 @@ exit_code: 0✅ [32mMerge complete- [2mMerged: [1mfeature[0m → [1mmain[0m[0m- [2mWorktree: Kept (use 'wt remove' to clean up)[0m[0m+[2mMerged: [1mfeature[0m → [1mmain[0m[0m+[2mWorktree: Kept (use 'wt remove' to clean up)[0m[0m----- stderr -----