git-gui: Simplify error case for unsupported merge types
authorShawn O. Pearce <spearce@spearce.org>
Fri, 20 Jul 2007 07:37:43 +0000 (03:37 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Sat, 21 Jul 2007 09:00:37 +0000 (05:00 -0400)
commiteea1ab6...23db4c929500fb11464a438b0ba569f0
tree8d9b348...b4f6e7a644b31ce3a08ab06af00a9347copy hash to clipboard (tree)
parentf66b8a6...f21d7dba6b80ba213315974476001b93copy hash to clipboard (diff)
lib/checkout_op.tcl