Shawn O. Pearce eea1ab6e23 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>		2007-07-21 05:00:37 -04:00
..
blame.tcl
branch_checkout.tcl
branch_create.tcl
branch_delete.tcl
branch_rename.tcl
branch.tcl
browser.tcl
checkout_op.tcl	git-gui: Simplify error case for unsupported merge types	2007-07-21 05:00:37 -04:00
choose_rev.tcl
class.tcl
commit.tcl	git-gui: Automatically backup the user's commit buffer	2007-07-21 04:57:57 -04:00
console.tcl
database.tcl
diff.tcl
encoding.tcl
error.tcl
index.tcl
merge.tcl
option.tcl
remote_branch_delete.tcl
remote.tcl
shortcut.tcl
status_bar.tcl
transport.tcl