jj-fzf: squash-into-parent: fix comment

Signed-off-by: Tim Janik <[email protected]>
tim-janik · Dec 19, 2024 · fe20c7d · fe20c7d
1 parent 9dba87a
commit fe20c7d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/jj-fzf b/jj-fzf
@@ -1082,8 +1082,8 @@ squash-into-parent()
     # Squashing without --keep-emptied would start a new branch at @- which is
     # undesired if @+ exists. But using --keep-emptied does not squash the
     # message. As a workaround, create a new @+, so we never squash directly
-    # from @. This new working copy will receive any children, merge parents
-    # and bookmarks from the original squashed working copy.
+    # from @. This new working copy will receive any children from the original
+    # squashed working copy.
     ( set -x
       jj new --insert-after @
       jj squash --from "$W" --into "$W-"