From fe20c7d912858c9a6020adc8895aa33cab81195b Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Thu, 19 Dec 2024 04:35:12 +0100
Subject: [PATCH] jj-fzf: squash-into-parent: fix comment

Signed-off-by: Tim Janik <timj@gnu.org>
---
 jj-fzf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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-"