laumann/pijul - Change ZYKNOCXPMKHQKFPUS2EDKSBHQODVMQ6J6OY6PPV26YPLKZGHWNKQC

Solving a conflict

Created by pmeunier on May 9, 2022

ZYKNOCXPMKHQKFPUS2EDKSBHQODVMQ6J6OY6PPV26YPLKZGHWNKQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/mod.rs at line 123 [5.133619]

B:BD[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

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 53 [5.178684]
B:B[4.237] → [2.1082:1111]
BD:B[4.237] → [2.1082:1111]
```
        std::mem::drop(txn);
```
Insertion in pijul/src/commands/credit.rs at line 54 [5.178684]
[2.1111]
[6.0]
```
        super::pager(repo.config.pager.as_ref());
```
Deletion in pijul/src/commands/credit.rs at line 179 [5.178684]
B:BD[5.180243] → [3.2944:2994]
BD:BD[5.180243] → [3.2944:2994]
```
        super::pager(repo.config.pager.as_ref());
```
Solving an order conflict in pijul/src/commands/credit.rs at line 179 [5.178684]
[5.182879]

Solving a conflict

Dependencies

In channels

Change contents

Replacement in pijul/src/commands/mod.rs at line 123 [5.133619]

Resurrecting zombie bytes in pijul/src/commands/credit.rs at line 53 [5.178684]

Insertion in pijul/src/commands/credit.rs at line 54 [5.178684]

Deletion in pijul/src/commands/credit.rs at line 179 [5.178684]

Solving an order conflict in pijul/src/commands/credit.rs at line 179 [5.178684]