Code

Add a merge label#1217

Code

Merged

yannham merged 4 commits intomastertweag/nickel:masterfrom task/merge-labeltweag/nickel:task/merge-labelCopy head branch name to clipboardApr 2, 2023

+186-119

Commits

Commits on Mar 31, 2023

• Add MergeLabel

  Show description for 32a57b8
  yannham

  committed
  32a57b8

  Copy full SHA for 32a57b8

• Adds a merge label parameter to the Merge primop

  Show description for 9743684
  yannham

  committed
  9743684

  Copy full SHA for 9743684

• Improve merge error reporting

  Show description for 37eeaa5
  yannham

  committed
  37eeaa5

  Copy full SHA for 37eeaa5

Commits on Apr 1, 2023

• Disable clippy warnings about too many args

  yannham

  committed
  8ce1014

  Copy full SHA for 8ce1014