Fixing a conflict

pmeunier

Feb 22, 2023, 5:30 PM

5E2AB2YLUOKJSBANKR3ZKHWWC7TB7SKSJUZVLT3O72YMVKYK3GEQC

Dependencies

• [2] U6TQX5Z2 pager function respects cli option and user config files, PAGER env var
• [3] UAXGGNAZ Improve command feedback
• [4] OU6JOR3C Add path filtering for log, add json output for log
• [5] 6F6AAHK4 Simplifying pijul::commands::log, and fixing Broken Pipe errors
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in pijul/src/commands/log.rs at line 464
  [4.14586]→[3.726:727](∅→∅),[4.14586]→[3.726:727](∅→∅)
  −
• resolve order conflict in pijul/src/commands/log.rs at line 464
  [2.2699]

  [4.136499]