Code

merge: remove Merge::take()#2535

Code

Merged

yuja merged 5 commits intojj-vcs:mainjj-vcs/jj:mainfrom yuja:push-pmmllvrsuqttyuja/jj:push-pmmllvrsuqttCopy head branch name to clipboardNov 6, 2023

+48-53

Commits

Commits on Nov 6, 2023

• files: use borrowed Merge iterator in merge()

  Show description for 1b36331
  yuja

  committed
  1b36331

• merge_tools: borrow file contents without consuming Merge object

  yuja

  committed
  4a466b6

• refs: use swap_remove() in non-trivial merge of ref targets

  Show description for 6b8f42f
  yuja

  committed
  6b8f42f

• refs: run non-trivial merge of ref targets without destructuring Merge object

  yuja

  committed
  1914047

• merge: remove Merge::take() which is no longer used

  Show description for dac9074
  yuja

  committed
  dac9074