ilyagr/pijul - Change HODZ2KUFCFSNV75KD7PP6CYLAD4XPY62DWVCAOKMOJTM65MHJSVQC

Matches https://github.com/ilyagr/pijul-clone as of now, might become out of sync

Solving a conflict

Created by pmeunier on February 23, 2023

HODZ2KUFCFSNV75KD7PP6CYLAD4XPY62DWVCAOKMOJTM65MHJSVQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in libpijul/src/change/parse.rs at line 122 [4.64713]
B:B[4.68289] → [2.1056:1123]
BD:B[4.68289] → [2.1056:1123]
```
    let (i, contents) = parse_contents('+', encoding.clone(), i)?;
```

Insertion in libpijul/src/change/parse.rs at line 122 [4.64713]

[4.68198]

[2.1056]

    let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;

Deletion in libpijul/src/change/parse.rs at line 124 [4.64713]
B:BD[4.68198] → [3.308:403]
BD:BD[4.68198] → [3.308:403]
```
    let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;
```
Solving an order conflict in libpijul/src/change/parse.rs at line 124 [4.64713]
[2.1123]
[4.68356]