Fixing the inverse of conflict resolutions

Dependencies

• [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [3] I52XSRUH Massive cleanup, and simplification
• [4] UNZXTNSJ Change text format: order dependencies in the order they were on the channel at record time

Change contents

• edit in libpijul/src/tests/mod.rs at line 18
  [2.289715]

  [2.289715]
  + mod rollback;
• edit in libpijul/src/diff/replace.rs at line 55
  [2.781585]

  [2.781585]
  + debug!("old {:?}", &lines_a[old..(old + old_len)]);

  + debug!("new {:?}", &lines_b[from_new..(from_new + len)]);

  +
• edit in libpijul/src/diff/mod.rs at line 82
  [2.795855]

  [2.795855]
  + debug!("old = {:?}", l);
• edit in libpijul/src/diff/mod.rs at line 94
  [2.796248]

  [2.796248]
  + debug!("new: {:?}", l);
• edit in libpijul/src/change.rs at line 463
  [2.845350]→[2.845350:845410](∅→∅)
  − let previous = flag | EdgeFlags::BLOCK;
• replacement in libpijul/src/change.rs at line 464
  [2.845451]→[2.845451:845546](∅→∅)
  − previous,

  − flag: previous | EdgeFlags::DELETED,
  [2.845451]

  [2.845546]
  + previous: flag,

  + flag: flag | EdgeFlags::DELETED,
• replacement in libpijul/src/apply.rs at line 764
  [2.969041]→[2.969041:969090](∅→∅)
  − if !e.flag.contains(EdgeFlags::FOLDER) {
  [2.969041]

  [2.969090]
  + if (e.flag & EdgeFlags::FOLDER | EdgeFlags::BLOCK).is_empty() {