From eea1ab6e23db4c929500fb11464a438b0ba569f0 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 20 Jul 2007 03:37:43 -0400 Subject: [PATCH] git-gui: Simplify error case for unsupported merge types If we are given a merge type we don't understand in checkout_op there is probably a bug in git-gui somewhere that allowed this unknown merge strategy to come into this part of the code path. We currently only recognize three merge types ('none', 'ff' and 'reset') but are going to be supporting more in the future. Rather than keep editing this message I'm going with a very generic "Uh, we don't do that!" type of error. Signed-off-by: Shawn O. Pearce --- lib/checkout_op.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } } -- 2.11.4.GIT