Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Add inline snapshots for new no-commit tests

Maximilian Roosef18aad7c467
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index ce29b2e37..108840f61 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1968,7 +1968,7 @@ fn test_merge_no_commit_with_clean_tree() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA]
+ πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -1976,7 +1976,6 @@ fn test_merge_no_commit_with_clean_tree() {
1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1) 
-
βœ… Kept worktree (use 'wt remove' to clean up)
----- stderr -----
@@ -2076,7 +2075,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA]
+ πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -2084,7 +2083,6 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1) 
-
βœ… Kept worktree (use 'wt remove' to clean up)
----- stderr -----