diff options
Diffstat (limited to 'lib/checkout_op.tcl')
| -rw-r--r-- | lib/checkout_op.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl index 6d87830dd6..554c107032 100644 --- 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 } } |