summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-20 07:37:43 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-21 09:00:37 (GMT)
commiteea1ab6e23db4c929500fb11464a438b0ba569f0 (patch)
tree8d9b348eb4f6e7a644b31ce3a08ab06af00a9347 /lib
parentf66b8a68f21d7dba6b80ba213315974476001b93 (diff)
downloadgit-eea1ab6e23db4c929500fb11464a438b0ba569f0.zip
git-eea1ab6e23db4c929500fb11464a438b0ba569f0.tar.gz
git-eea1ab6e23db4c929500fb11464a438b0ba569f0.tar.bz2
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 <spearce@spearce.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/checkout_op.tcl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index 6d87830..554c107 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
}
}