# HG changeset patch
# User boehmes
# Date 1257762862 -3600
# Node ID 535789c26230f227233352df4abd4de57000e598
# Parent  9fd3de94e6a20036fcee8df2dd4d58de9b5750d8
follow standard theory merge behaviour: do not change already selected solver

diff -r 9fd3de94e6a2 -r 535789c26230 src/HOL/SMT/Tools/smt_solver.ML
--- a/src/HOL/SMT/Tools/smt_solver.ML	Mon Nov 09 11:19:25 2009 +0100
+++ b/src/HOL/SMT/Tools/smt_solver.ML	Mon Nov 09 11:34:22 2009 +0100
@@ -227,7 +227,7 @@
   type T = string
   val empty = no_solver
   val extend = I
-  fun merge (_, s) = s
+  fun merge (s, _) = s
 )
 
 val solver_name_of = Selected_Solver.get