jcdickinson/pijul - Change PDTUHOMVQ2NUN2MMFZL7F4NI3EXOK5SOBBS34DF4ACFOJCB5NQTAC

fix left over conflicts

Created by rohan on February 26, 2021

PDTUHOMVQ2NUN2MMFZL7F4NI3EXOK5SOBBS34DF4ACFOJCB5NQTAC

Dependencies

[2] Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC
[3] EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC
[4] NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC
[5] SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC
[6] YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC
[7] UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC
[8] VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC
[9] JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC
[10] 6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC

In channels

main

Change contents

Solving an order conflict in libpijul/src/record.rs at line 281 [5.488880]
[3.29]
[4.2232]

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 291 [5.488880]

∅:∅[2.996] → [4.2625:2853]

B:B[4.2625] → [4.2625:2853]

BD:B[4.2625] → [4.2625:2853]

                        inode: Position {
                            change: None,
                            pos: inode_pos,
                        },
                    })),
                    encoding,
                )

Solving an order conflict in libpijul/src/change/text_changes.rs at line 1245 [8.37976]
[6.143228]
[7.592]
Solving an order conflict in libpijul/Cargo.toml at line 116 [5.1020742]
[9.730]
[10.5871]

fix left over conflicts

Dependencies

In channels

Change contents

Solving an order conflict in libpijul/src/record.rs at line 281 [5.488880]

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 291 [5.488880]

Solving an order conflict in libpijul/src/change/text_changes.rs at line 1245 [8.37976]

Solving an order conflict in libpijul/Cargo.toml at line 116 [5.1020742]