changeset 39036 | b32975d3db3e |
parent 36514 | 73ed9f18fdd3 |
child 40104 | 0e1bd289c8ea |
1.1 --- a/src/HOL/Tools/Function/scnp_reconstruct.ML Thu Aug 26 16:56:45 2010 +0200 1.2 +++ b/src/HOL/Tools/Function/scnp_reconstruct.ML Thu Aug 26 17:01:12 2010 +0200 1.3 @@ -68,7 +68,7 @@ 1.4 type T = multiset_setup option 1.5 val empty = NONE 1.6 val extend = I; 1.7 - fun merge (v1, v2) = if is_some v2 then v2 else v1 (* FIXME prefer v1 !?! *) 1.8 + fun merge (v1, v2) = if is_some v1 then v1 else v2 1.9 ) 1.10 1.11 val multiset_setup = Multiset_Setup.put o SOME