Fix an old conflict

pmeunier

Aug 8, 2022, 7:19 AM

3UZ65KYC2YLFXRQAL7ADPXZJHVSOSJUR44FXKQN2WKBIXAMALMGAC

Dependencies

• [2] PDTUHOMV fix left over conflicts
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [4] EQLDTLXV Fixing a bug with empty new files, and another one with empty replacements
• [5] I24UEJQL Various post-fire fixes
• [6] NYOF5766 track file encoding in the record, including change text for file adds
• [7] TVVW53HZ Conflict resolution

Change contents

• edit in libpijul/src/record.rs at line 811
  [3.29]→[2.0:0](∅→∅),[3.29]→[2.0:0](∅→∅)
  −