git-gui: Simplify error case for unsupported merge types

diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index 6d87830dd610c0c7cb8250671a79f8abae4501c1..554c107032458f3b9585b58d7920924acf0ecb69 100644 (file)
--- a/lib/checkout_op.tcl
+++ b/lib/checkout_op.tcl
@@ -208,7 +208,7 @@ method _update_ref {} {
                                }
                        }
                        default {
-                               _error $this "Only 'ff' and 'reset' merge is currently supported."
+                               _error $this "Merge strategy '$merge_type' not supported."
                                return 0
                        }
                        }