Solving a conflict

May 9, 2022, 6:55 AM

ZYKNOCXPMKHQKFPUS2EDKSBHQODVMQ6J6OY6PPV26YPLKZGHWNKQC

Dependencies

[2] YXAVFTPP Allowing vertex buffer to use references to the transaction, by changing `output::output` to take an ArcTxn<T> instead of a simple T
[3] U6TQX5Z2 pager function respects cli option and user config files, PAGER env var
[4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[5] EUZFFJSO Updating Pijul with the latest changes in Libpijul
[6] Y7YAFMFF Fix path prefix striping on Windows.
[7] 5YDI33C4 Fixing pager on OSX
[8] I24UEJQL Various post-fire fixes
[9] 2K7JLB4Z No pager on Windows
[10] 5DVRL6MF Hard-unrecord
[11] GLRGFBCW Checking the version of less we have
[12] OWCCRVO5 Fixing a broken pipe in credit
[13] NLGQAH4H Credit and reset relative to current directory instead of the root

replacement in pijul/src/commands/mod.rs at line 123

[4.3]→[3.59:369](∅→∅)

/// Respect the `pager` key/value pair in both the user's repository config, and their global config.
/// The global configuration requires no additional arguments, but the other two are optional to cover
/// cases in which that information is not available. Users can also disable the pager by not setting

[4.3]

[3.369]

/// Respect the `pager` key/value pair in both the user's repository config, and their global config.
/// The global configuration requires no additional arguments, but the other two are optional to cover
/// cases in which that information is not available. Users can also disable the pager by not setting
resurrect zombie in pijul/src/commands/credit.rs at line 53

[4.237]→[2.1082:1111](∅→∅),[4.237]→[2.1082:1111](∅→∅)

std::mem::drop(txn);
edit in pijul/src/commands/credit.rs at line 54

[2.1111]

[4.0]

super::pager(repo.config.pager.as_ref());
edit in pijul/src/commands/credit.rs at line 179

[4.180243]→[3.2944:2994](∅→∅),[4.180243]→[3.2944:2994](∅→∅)

super::pager(repo.config.pager.as_ref());
resolve order conflict in pijul/src/commands/credit.rs at line 179

[4.182879]