Logic.thy;
cdd2284c8047
Actions

Description

merged, resolving conflict in src/Doc/Implementation/Logic.thy;

Details

Provenance

Authored on

Parents

rISABELLE70be57333ea1: Added tag Isabelle2021-1 for changeset c2a2be496f35
rISABELLE0dd4dbe7bed3: provide component naproche-20211211;

Branches

Unknown

Tags

Unknown

Event Timeline

makarius committed rISABELLEcdd2284c8047: merged, resolving conflict in src/Doc/Implementation/Logic.thy;.Dec 12 2021, 11:18 AM

Merged Changes

70be57333ea1 Added tag Isabelle2021-1 for changeset c2a2be496f35
Author
makarius
Browse Repository
No Builds
No Audits
c2a2be496f35 tuned;
Author
makarius
Browse Repository
No Builds
No Audits
c49362e85f5a proper ML types (amending 1aa92bc4d356);
Author
makarius
Browse Repository
No Builds
No Audits
74a800810bde proper types for Scala.Fun instances (amending 1aa92bc4d356);
Author
makarius
Browse Repository
No Builds
No Audits
bdaf29253394 proper syntax category;
Author
makarius
Browse Repository
No Builds
No Audits

Changes (74)

Path

Size

Admin/

components/

components.sha1

CONTRIBUTORS

NEWS

lib/

texinputs/

isabelle.sty

src

Doc/

Implementation/

Logic.thy

Isar_Ref/

Outer_Syntax.thy

Tutorial/

ToyList/

Bali/

Computational_Algebra/

Eisbach/

document/

	Examples/
	ex/

Library/

TPTP/

ATP_Theory_Export.thy

atp_problem_import.ML

atp_theory_export.ML

Tools/

ATP/

atp_problem.ML

atp_problem_generate.ML

Metis/

metis_generate.ML

metis_reconstruct.ML

metis_tactic.ML

Mirabelle/

mirabelle_sledgehammer.ML

Sledgehammer/

sledgehammer_atp_systems.ML

sledgehammer_prover.ML

sledgehammer_prover_atp.ML

sledgehammer_prover_smt.ML

Wellfounded.thy

Rewrite_Examples.thy

Pure/

Admin/

build_release.scala

build_status.scala

isabelle_cronjob.scala

General/

Isar/

ML/

PIDE/

Thy/

document_antiquotations.ML

Tools/

update_cartouches.scala

update_comments.scala

pure_syn.ML

Tools/

Code/

code_target.ML

VSCode/

extension/

README.md

package.json

jEdit/

src/

jedit_rendering.scala

rISABELLEcdd2284c8047

View Options

Admin/components/components.sha1

View Options

CONTRIBUTORS

View Options

NEWS

View Options

lib/texinputs/isabelle.sty

View Options

src/Doc/Implementation/Logic.thy

View Options

src/Doc/Isar_Ref/Outer_Syntax.thy

View Options

src/Doc/Tutorial/ToyList/ToyList.thy

View Options

src/HOL/ATP.thy

View Options

src/HOL/BNF_Def.thy

View Options

src/HOL/Bali/Term.thy

View Options

src/HOL/Computational_Algebra/Factorial_Ring.thy

View Options

src/HOL/Deriv.thy

View Options

src/HOL/Eisbach/match_method.ML

View Options

src/HOL/Equiv_Relations.thy

View Options

src/HOL/Examples/Rewrite_Examples.thy

View Options

src/HOL/Examples/document/root.tex

View Options

src/HOL/Library/Multiset.thy

View Options

src/HOL/Library/Multiset_Order.thy

View Options

src/HOL/Library/Rewrite.thy

View Options

src/HOL/List.thy

View Options

src/HOL/Map.thy

View Options

src/HOL/ROOT

View Options

src/HOL/Relation.thy

View Options

src/HOL/Set_Interval.thy

View Options

src/HOL/TPTP/ATP_Theory_Export.thy

View Options

src/HOL/TPTP/atp_problem_import.ML

View Options

src/HOL/TPTP/atp_theory_export.ML

View Options

src/HOL/Tools/ATP/atp_problem.ML

View Options

src/HOL/Tools/ATP/atp_problem_generate.ML

View Options

src/HOL/Tools/Metis/metis_generate.ML

View Options

src/HOL/Tools/Metis/metis_reconstruct.ML

View Options

src/HOL/Tools/Metis/metis_tactic.ML

View Options

src/HOL/Tools/Mirabelle/mirabelle_sledgehammer.ML

View Options

src/HOL/Tools/Sledgehammer/sledgehammer_atp_systems.ML

View Options

src/HOL/Tools/Sledgehammer/sledgehammer_prover.ML

View Options

src/HOL/Tools/Sledgehammer/sledgehammer_prover_atp.ML

View Options

src/HOL/Tools/Sledgehammer/sledgehammer_prover_smt.ML

View Options

src/HOL/Wellfounded.thy

View Options

src/HOL/ex/Rewrite_Examples.thy

View Options

src/Pure/Admin/build_release.scala

View Options

src/Pure/Admin/build_status.scala

View Options

src/Pure/Admin/isabelle_cronjob.scala

View Options

src/Pure/General/mailman.scala

View Options

src/Pure/General/scan.scala

View Options

src/Pure/Isar/args.ML

View Options

src/Pure/Isar/method.ML

View Options

src/Pure/Isar/parse.ML

View Options

src/Pure/Isar/parse.scala

View Options

src/Pure/Isar/token.ML

View Options

src/Pure/Isar/token.scala

View Options

src/Pure/ML/ml_antiquotations.ML

View Options

src/Pure/ML/ml_statistics.scala

View Options

src/Pure/PIDE/command.ML

View Options

src/Pure/PIDE/markup.scala

View Options

src/Pure/PIDE/rendering.scala

View Options

src/Pure/Pure.thy

View Options

src/Pure/Thy/bibtex.ML

View Options

src/Pure/Thy/document_antiquotations.ML

View Options

src/Pure/Thy/document_output.ML

View Options

src/Pure/Thy/latex.ML

View Options

src/Pure/Thy/sessions.ML

View Options

src/Pure/Thy/thy_header.ML

View Options

src/Pure/Tools/rail.ML

View Options

src/Pure/Tools/update_cartouches.scala

View Options

src/Pure/Tools/update_comments.scala

View Options

src/Pure/pure_syn.ML

View Options

src/Tools/Code/code_target.ML

View Options

src/Tools/VSCode/extension/README.md

View Options

src/Tools/VSCode/extension/package.json

View Options

src/Tools/jEdit/src/jedit_rendering.scala

merged, resolving conflict in src/Doc/Implementation/Logic.thy;cdd2284c8047Actions

Description

Details

Event Timeline

Merged Changes

Changes (74)

rISABELLEcdd2284c8047

Admin/components/components.sha1

CONTRIBUTORS

NEWS

lib/texinputs/isabelle.sty

src/Doc/Implementation/Logic.thy

src/Doc/Isar_Ref/Outer_Syntax.thy

src/Doc/Tutorial/ToyList/ToyList.thy

src/HOL/ATP.thy

src/HOL/BNF_Def.thy

src/HOL/Bali/Term.thy

src/HOL/Computational_Algebra/Factorial_Ring.thy

src/HOL/Deriv.thy

src/HOL/Eisbach/match_method.ML

src/HOL/Equiv_Relations.thy

src/HOL/Examples/Rewrite_Examples.thy

src/HOL/Examples/document/root.tex

src/HOL/Library/Multiset.thy

src/HOL/Library/Multiset_Order.thy

src/HOL/Library/Rewrite.thy

src/HOL/List.thy

src/HOL/Map.thy

src/HOL/ROOT

src/HOL/Relation.thy

src/HOL/Set_Interval.thy

src/HOL/TPTP/ATP_Theory_Export.thy

src/HOL/TPTP/atp_problem_import.ML

src/HOL/TPTP/atp_theory_export.ML

src/HOL/Tools/ATP/atp_problem.ML

src/HOL/Tools/ATP/atp_problem_generate.ML

src/HOL/Tools/Metis/metis_generate.ML

src/HOL/Tools/Metis/metis_reconstruct.ML

src/HOL/Tools/Metis/metis_tactic.ML

src/HOL/Tools/Mirabelle/mirabelle_sledgehammer.ML

src/HOL/Tools/Sledgehammer/sledgehammer_atp_systems.ML

src/HOL/Tools/Sledgehammer/sledgehammer_prover.ML

src/HOL/Tools/Sledgehammer/sledgehammer_prover_atp.ML

src/HOL/Tools/Sledgehammer/sledgehammer_prover_smt.ML

src/HOL/Wellfounded.thy

src/HOL/ex/Rewrite_Examples.thy

src/Pure/Admin/build_release.scala

src/Pure/Admin/build_status.scala

src/Pure/Admin/isabelle_cronjob.scala

src/Pure/General/mailman.scala

src/Pure/General/scan.scala

src/Pure/Isar/args.ML

src/Pure/Isar/method.ML

src/Pure/Isar/parse.ML

src/Pure/Isar/parse.scala

src/Pure/Isar/token.ML

src/Pure/Isar/token.scala

src/Pure/ML/ml_antiquotations.ML

src/Pure/ML/ml_statistics.scala

src/Pure/PIDE/command.ML

src/Pure/PIDE/markup.scala

src/Pure/PIDE/rendering.scala

src/Pure/Pure.thy

src/Pure/Thy/bibtex.ML

src/Pure/Thy/document_antiquotations.ML

src/Pure/Thy/document_output.ML

src/Pure/Thy/latex.ML

src/Pure/Thy/sessions.ML

src/Pure/Thy/thy_header.ML

src/Pure/Tools/rail.ML

src/Pure/Tools/update_cartouches.scala

src/Pure/Tools/update_comments.scala

src/Pure/pure_syn.ML

src/Tools/Code/code_target.ML

src/Tools/VSCode/extension/README.md

src/Tools/VSCode/extension/package.json

src/Tools/jEdit/src/jedit_rendering.scala

merged, resolving conflict in src/Doc/Implementation/Logic.thy;
cdd2284c8047
Actions