diff options
| author |  Stephane Glondu <steph@glondu.net> | 2012-12-29 10:57:45 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2012-12-29 10:57:45 +0100 |
| commit | 357d49cfb956380788efbf6d080ab00e678d29f7 (patch) | |
| tree | 2b133eca4ef9b37eb9245db01db72493e5cbe19b /proofs/clenvtac.ml | |
| parent | eabf57d06ca1eafa762d7f31262e5515401eff55 (diff) | |
| parent | bf12eb93f3f6a6a824a10878878fadd59745aae0 (diff) | |
Merge tag 'upstream/8.4pl1dfsg' into experimental/master
Upstream version 8.4pl1dfsg
Diffstat (limited to 'proofs/clenvtac.ml')
| -rw-r--r-- | proofs/clenvtac.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/proofs/clenvtac.ml b/proofs/clenvtac.ml index ca8fd6ae..d18ee73f 100644 --- a/proofs/clenvtac.ml +++ b/proofs/clenvtac.ml @@ -105,6 +105,7 @@ let fail_quick_unif_flags = { use_metas_eagerly_in_conv_on_closed_terms = false; modulo_delta = empty_transparent_state; modulo_delta_types = full_transparent_state; + modulo_delta_in_merge = None; check_applied_meta_types = false; resolve_evars = false; use_pattern_unification = false; |