| commit | eea1ab6e23db4c929500fb11464a438b0ba569f0 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 20 Jul 2007 07:37:43 +0000 (20 03:37 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 21 Jul 2007 09:00:37 +0000 (21 05:00 -0400) | ||
| tree | 8d9b348eb4f6e7a644b31ce3a08ab06af00a9347 | treesnapshot (tar.gz zip) |
| parent | f66b8a68f21d7dba6b80ba213315974476001b93 | commitdiff |
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>
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>
| lib/checkout_op.tcl | diffblobblamehistory |