laumann/pijul-conflicts - Change 5GHJGOIMBCVYKMQ3U3ZZWD2AVODY4REP6A5WYODIDF5EHPZUYZMAC

readme: update test output

Created by laumann on June 15, 2023

5GHJGOIMBCVYKMQ3U3ZZWD2AVODY4REP6A5WYODIDF5EHPZUYZMAC

Dependencies

In channels

main

Change contents

Replacement in README.md at line 17 [5.34]

B:BD[3.39] → [4.98:192]

∅:D[4.192] → [3.133:151]

B:BD[3.133] → [3.133:151]

B:BD[3.151] → [4.193:253]

∅:D[4.253] → [3.211:253]

B:BD[3.211] → [3.211:253]

B:BD[3.253] → [4.254:314]

∅:D[4.314] → [3.313:355]

B:BD[3.313] → [3.313:355]

B:BD[3.355] → [4.315:375]

Repository created at /tmp/tmp.9zEucXHwmf
/tmp/tmp.9zEucXHwmf ~/sources/pijul/pijul-conflicts
Tracked 1 path(s)
Hash: XEV3C5VQ6YGEOTUEVQOMXCQDQGXKKRCQICOCLSLJ6Y5KOMTPPXCAC
Reset given paths to last recorded change
Hash: LB3DIKQ2M7XPJBXB2FGR5U2APBQN7P7BN7A5OKXBGHGOMDFWEPPAC
Reset given paths to last recorded change
Hash: YNHLT3DHY7YAIAUM4LH2O4DPZURDPHH6FB5MVPANYMFZXLY47ABQC

[3.39]

[3.543]

test: order_conflict in repo /tmp/tmp.L4lZtYD2Cq

Replacement in README.md at line 21 [5.34]

B:BD[2.1586] → [2.1586:1603]

  order file.txt

[2.1586]

[3.816]

  order file.txt:2
test: zombies in repo /tmp/tmp.LfiJKvo7tp
On channel main
Conflicts
  zombie line file.txt:2