laumann/pijul - Change ADZQB6NYJ2TUVXPIEWOZT7D7C7TU2MRB6PXFKZCR2TBLPWUCR6XQC

Personal fork of https://nest.pijul.com/pijul/pijul

Fixing a bug that could cause some conflict resolution markers to be ignored when diffing

Created by pmeunier on February 27, 2023

ADZQB6NYJ2TUVXPIEWOZT7D7C7TU2MRB6PXFKZCR2TBLPWUCR6XQC

Dependencies

[2] SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC

In channels

main

Change contents

Replacement in libpijul/src/diff/replace.rs at line 298 [2.779907]
B:BD[2.790034] → [2.790034:790086]
```
                while pos_bytes < next_vertex_pos {
```
[2.790034]
[2.790086]
```
                loop {
```

Insertion in libpijul/src/diff/replace.rs at line 309 [2.779907]

[2.790553]

[2.790553]

                    }
                    if pos_bytes >= next_vertex_pos {
                        break