diff --git a/jj-fzf b/jj-fzf index 2e7684e..f338121 100755 --- 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-"