Display UnsolveOrderConflict correctly in diff --short

sellout

Sep 26, 2022, 5:29 AM

X6TM3HVPIMUVPIFLUQWNND6ZKDHT52LONNBRLFJ2VUQNCUAHXSDAC

Dependencies

• [2] OQQ4TGEM Printing modifications only once in pijul diff
• [3] I52XSRUH Massive cleanup, and simplification
• [4] CCFJ7VO3 Renaming "Record" to "Hunk" in the changes
• [5] AGTMM5U7 More informative diff --short
• [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• replacement in pijul/src/commands/diff.rs at line 200
  [3.5335]→[2.812:898](∅→∅)
  − } => changes.entry(path).or_insert(BTreeSet::new()).insert("SC"),
  [3.5335]

  [3.1473]
  + } => changes.entry(path).or_insert(BTreeSet::new()).insert("UC"),