Code

ConflictDetector: kill both tasks#2540

Code

Open

smurfix wants to merge 4 commits intopython-trio:mainpython-trio/trio:mainfrom smurfix:conflictsmurfix/trio:conflictCopy head branch name to clipboard

+31-19

Commits

Commits on Jan 18, 2023

• ConflictDetector: kill both tasks

  Show description for 4ca239a
  smurfix

  committed
  4ca239a

  Copy full SHA for 4ca239a

• add newsfragment

  smurfix

  committed
  39d0f6f

  Copy full SHA for 39d0f6f

• Test fixups

  smurfix

  committed
  44f6559

  Copy full SHA for 44f6559

• Fix formatting

  smurfix

  committed
  6adbaf0

  Copy full SHA for 6adbaf0