merged, resolving minor conflict;
b982362eeca4
Actions

Description

merged, resolving minor conflict;

Details

Provenance

Authored on

Parents

Branches

Unknown

Tags

Unknown

Merged Changes

Changes (8)

Path

Size

src/

HOL/

Tools/

Mirabelle/

Pure/

PIDE/

System/

Thy/

Tools/

Tools/

VSCode/

src/

jEdit/

src/

rISABELLEb982362eeca4

src/HOL/Tools/Mirabelle/mirabelle.scala

src/Pure/PIDE/headless.scala

src/Pure/System/isabelle_process.scala

src/Pure/Thy/thy_info.ML

src/Pure/Tools/build.scala

src/Pure/Tools/build_job.scala

src/Tools/VSCode/src/language_server.scala

src/Tools/jEdit/src/jedit_sessions.scala

merged, resolving minor conflict;b982362eeca4Actions

Description

Details

Merged Changes

Changes (8)

rISABELLEb982362eeca4

src/HOL/Tools/Mirabelle/mirabelle.scala

src/Pure/PIDE/headless.scala

src/Pure/System/isabelle_process.scala

src/Pure/Thy/thy_info.ML

src/Pure/Tools/build.scala

src/Pure/Tools/build_job.scala

src/Tools/VSCode/src/language_server.scala

src/Tools/jEdit/src/jedit_sessions.scala

merged, resolving minor conflict;
b982362eeca4
Actions