pijul/pijul - Change CRLBACYQMGJVAV5VV3PA6PDSV4R3K2EUE2DGV5QZXJVOKZCRE25AC

Fixing conflicts

Created by pmeunier on December 26, 2025

CRLBACYQMGJVAV5VV3PA6PDSV4R3K2EUE2DGV5QZXJVOKZCRE25AC

Dependencies

In channels

main

Change contents

File deletion: Cargo.lock, Cargo.lock
BFD:BFD[3.2] → [4.0:34]
BFD:BFD[3.2] → [4.0:34]
BFD:BFD[4.34] → [4.35:35]

Resurrecting zombie bytes in pijul/Cargo.toml at line 18 [6.196374]

B:B[6.197381] → [7.2005:2247]

BD:B[6.197381] → [7.2005:2247]

B:B[7.2298] → [7.2298:2325]

BD:B[7.2298] → [7.2298:2325]

B:B[7.2348] → [7.2348:2380]

BD:B[7.2348] → [7.2348:2380]

B:B[7.2404] → [7.2404:2549]

BD:B[7.2404] → [7.2404:2549]

B:B[7.2604] → [7.2604:2654]

BD:B[7.2604] → [7.2604:2654]

B:B[7.2709] → [7.2709:2859]

BD:B[7.2709] → [7.2709:2859]

libpijul = { workspace = true, features = ["tarball"] }
pijul-config.workspace = true
pijul-identity.workspace = true
pijul-interaction.workspace = true
pijul-remote.workspace = true
pijul-repository.workspace = true
anyhow.workspace = true
byteorder.workspace = true
canonical-path.workspace = true
clap = { workspace = true, features = ["derive", "cargo"] }
clap_complete.workspace = true
ctrlc.workspace = true
data-encoding.workspace = true
edit.workspace = true
env_logger.workspace = true
git2 = { workspace = true, optional = true }
human-panic.workspace = true
hyper = { workspace = true, features = ["server"] }
ignore.workspace = true

Resurrecting zombie bytes in pijul/Cargo.toml at line 39 [6.196374]
∅:∅[9.2983] → [7.2859:2884]
B:B[7.2859] → [7.2859:2884]
BD:B[7.2859] → [7.2859:2884]
B:B[7.2913] → [7.2913:3052]
BD:B[7.2913] → [7.2913:3052]
B:B[7.3077] → [7.3077:3265]
BD:B[7.3077] → [7.3077:3265]
B:B[7.3352] → [7.3352:3375]
BD:B[7.3352] → [7.3352:3375]
B:B[7.3375] → [2.939:939]
BD:B[7.3375] → [2.939:939]
∅:∅[2.939] → [10.118:140]
B:B[7.3375] → [10.118:140]
BD:B[7.3375] → [10.118:140]
```
keyring.workspace = true
log.workspace = true
open.workspace = true
path-slash.workspace = true
ptree.workspace = true
rand.workspace = true
regex.workspace = true
sanakirja.workspace = true
serde_derive.workspace = true
serde_json.workspace = true
serde.workspace = true
tempfile.workspace = true
termcolor.workspace = true
thiserror.workspace = true
tokio.workspace = true
toml.workspace = true
```

Deletion in Cargo.lock at line 49 [6.1030385]

B:BD[5.1231] → [5.1231:1468]

name = "android_system_properties"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
 "libc",
]
[[package]]

Replacement in Cargo.lock at line 145 [6.1030385]
B:BD[5.4025] → [5.4025:4043]
```
version = "1.8.0"
```
[5.4025]
[5.4043]
```
version = "1.8.1"
```

Replacement in Cargo.lock at line 147 [6.1030385]

B:BD[5.4108] → [5.4108:4186]

checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"

[5.4108]

[5.4186]

checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a"

Replacement in Cargo.lock at line 274 [6.1030385]
B:BD[5.7374] → [5.7374:7393]
```
version = "3.19.0"
```
[5.7374]
[5.7393]
```
version = "3.19.1"
```

Replacement in Cargo.lock at line 276 [6.1030385]

B:BD[5.7458] → [5.7458:7536]

checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"

[5.7458]

[5.7536]

checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"

Replacement in Cargo.lock at line 298 [6.1030385]
B:BD[5.8142] → [5.8142:8161]
```
version = "1.2.48"
```
[5.8142]
[5.8161]
```
version = "1.2.51"
```

Replacement in Cargo.lock at line 300 [6.1030385]

B:BD[5.8226] → [5.8226:8304]

checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a"

[5.8226]

[5.8304]

checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"

Replacement in Cargo.lock at line 374 [6.1030385]
B:BD[5.10018] → [5.10018:10037]
```
version = "4.5.61"
```
[5.10018]
[5.10037]
```
version = "4.5.62"
```

Replacement in Cargo.lock at line 376 [6.1030385]

B:BD[5.10102] → [5.10102:10180]

checksum = "39615915e2ece2550c0149addac32fb5bd312c657f43845bb9088cb9c8a7c992"

[5.10102]

[5.10180]

checksum = "004eef6b14ce34759aa7de4aea3217e368f463f46a3ed3764ca4b5a4404003b4"

Replacement in Cargo.lock at line 411 [6.1030385]
B:BD[5.11060] → [5.11060:11072]
```
 "windows",
```
[5.11060]
[5.11072]
```
 "windows 0.44.0",
```
Replacement in Cargo.lock at line 554 [6.1030385]
B:BD[5.14662] → [5.14662:14680]
```
version = "3.2.0"
```
[5.14662]
[5.14680]
```
version = "3.2.1"
```

Replacement in Cargo.lock at line 556 [6.1030385]

B:BD[5.14745] → [5.14745:14823]

checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"

[5.14745]

[5.14823]

checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"

Replacement in Cargo.lock at line 574 [6.1030385]
B:BD[5.15150] → [5.15150:15168]
```
version = "0.9.9"
```
[5.15150]
[5.15168]
```
version = "0.9.10"
```

Replacement in Cargo.lock at line 576 [6.1030385]

B:BD[5.15233] → [5.15233:15311]

checksum = "190b6255e8ab55a7b568df5a883e9497edc3e4821c06396612048b430e5ad1e9"

[5.15233]

[5.15311]

checksum = "21b3aa68d7e7abee336255bd7248ea965cc393f3e70411135a6f6a4b651345d4"

Replacement in Cargo.lock at line 868 [6.1030385]
B:BD[5.22166] → [5.22166:22184]
```
version = "0.1.5"
```
[5.22166]
[5.22184]
```
version = "0.1.6"
```

Replacement in Cargo.lock at line 870 [6.1030385]

B:BD[5.22249] → [5.22249:22327]

checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"

[5.22249]

[5.22327]

checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"

Replacement in Cargo.lock at line 874 [6.1030385]
B:BD[5.22356] → [5.22356:22374]
```
version = "1.1.7"
```
[5.22356]
[5.22374]
```
version = "1.1.5"
```

Replacement in Cargo.lock at line 876 [6.1030385]

B:BD[5.22439] → [5.22439:22517]

checksum = "a2152dbcb980c05735e2a651d96011320a949eb31a0c8b38b72645ce97dec676"

[5.22439]

[5.22517]

checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"

Replacement in Cargo.lock at line 1080 [6.1030385]
B:BD[5.27647] → [5.27647:27666]
```
version = "0.20.2"
```
[5.27647]
[5.27666]
```
version = "0.20.3"
```

Replacement in Cargo.lock at line 1082 [6.1030385]

B:BD[5.27731] → [5.27731:27809]

checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"

[5.27731]

[5.27809]

checksum = "3e2b37e2f62729cdada11f0e6b3b6fe383c69c29fc619e391223e12856af308c"

Replacement in Cargo.lock at line 1207 [6.1030385]
B:BD[5.30726] → [5.30726:30744]
```
version = "2.0.4"
```
[5.30726]
[5.30744]
```
version = "2.0.5"
```

Replacement in Cargo.lock at line 1209 [6.1030385]

B:BD[5.30809] → [5.30809:30887]

checksum = "9a8a07a0957cd4a3cad4a1e4ca7cd5ea07fcacef6ebe2e5d0c7935bfc95120d8"

[5.30809]

[5.30887]

checksum = "69c3a5eccb191563dc17c9e350fd7584292ab2910824a5750b117d9c466e1734"

Deletion in Cargo.lock at line 1214 [6.1030385]
B:BD[5.30943] → [5.30943:30955]
```
 "os_info",
```
Replacement in Cargo.lock at line 1216 [6.1030385]
B:BD[5.30982] → [5.30982:30997]
```
 "toml 0.9.8",
```
[5.30982]
[5.30997]
```
 "sysinfo",
 "toml 0.9.10+spec-1.1.0",
```
Replacement in Cargo.lock at line 1306 [6.1030385]
B:BD[5.32844] → [5.32844:32862]
```
version = "2.1.1"
```
[5.32844]
[5.32862]
```
version = "2.1.2"
```

Replacement in Cargo.lock at line 1308 [6.1030385]

B:BD[5.32927] → [5.32927:33005]

checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"

[5.32927]

[5.33005]

checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"

Replacement in Cargo.lock at line 1320 [6.1030385]
B:BD[5.33172] → [5.33172:33190]
```
version = "2.1.1"
```
[5.33172]
[5.33190]
```
version = "2.1.2"
```

Replacement in Cargo.lock at line 1322 [6.1030385]

B:BD[5.33255] → [5.33255:33333]

checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"

[5.33255]

[5.33333]

checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"

Replacement in Cargo.lock at line 1460 [6.1030385]
B:BD[5.36605] → [5.36605:36624]
```
version = "1.0.15"
```
[5.36605]
[5.36624]
```
version = "1.0.16"
```

Replacement in Cargo.lock at line 1462 [6.1030385]

B:BD[5.36689] → [5.36689:36767]

checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"

[5.36689]

[5.36767]

checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010"

Replacement in Cargo.lock at line 1466 [6.1030385]
B:BD[5.36794] → [5.36794:36813]
```
version = "0.2.16"
```
[5.36794]
[5.36813]
```
version = "0.2.17"
```

Replacement in Cargo.lock at line 1468 [6.1030385]

B:BD[5.36878] → [5.36878:36956]

checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"

[5.36878]

[5.36956]

checksum = "a87d9b8105c23642f50cbbae03d1f75d8422c5cb98ce7ee9271f7ff7505be6b8"

Replacement in Cargo.lock at line 1481 [6.1030385]
B:BD[5.37139] → [5.37139:37158]
```
version = "0.2.16"
```
[5.37139]
[5.37158]
```
version = "0.2.17"
```

Replacement in Cargo.lock at line 1483 [6.1030385]

B:BD[5.37223] → [5.37223:37301]

checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"

[5.37223]

[5.37301]

checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58"

Replacement in Cargo.lock at line 1492 [6.1030385]
B:BD[5.37386] → [5.37386:37404]
```
version = "0.1.4"
```
[5.37386]
[5.37404]
```
version = "0.1.5"
```

Replacement in Cargo.lock at line 1494 [6.1030385]

B:BD[5.37469] → [5.37469:37547]

checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524"

[5.37469]

[5.37547]

checksum = "68971ebff725b9e2ca27a601c5eb38a4c5d64422c4cbab0c535f248087eda5c2"

Replacement in Cargo.lock at line 1560 [6.1030385]
B:BD[5.39237] → [5.39237:39255]
```
version = "0.2.6"
```
[5.39237]
[5.39255]
```
version = "0.2.7"
```

Replacement in Cargo.lock at line 1562 [6.1030385]

B:BD[5.39320] → [5.39320:39398]

checksum = "5cbe856efeb50e4681f010e9aaa2bf0a644e10139e54cde10fc83a307c23bd9f"

[5.39320]

[5.39398]

checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"

Replacement in Cargo.lock at line 1569 [6.1030385]
B:BD[5.39466] → [5.39466:39491]
```
version = "0.18.2+1.9.1"
```
[5.39466]
[5.39491]
```
version = "0.18.3+1.9.2"
```

Replacement in Cargo.lock at line 1571 [6.1030385]

B:BD[5.39556] → [5.39556:39634]

checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"

[5.39556]

[5.39634]

checksum = "c9b3acc4b91781bb0b3386669d325163746af5f6e4f73e6d2d630e09a35f3487"

Replacement in Cargo.lock at line 1635 [6.1030385]
B:BD[5.40510] → [5.40510:40529]
```
version = "0.1.10"
```
[5.40510]
[5.40529]
```
version = "0.1.11"
```

Replacement in Cargo.lock at line 1637 [6.1030385]

B:BD[5.40594] → [5.40594:40672]

checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"

[5.40594]

[5.40672]

checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50"

Replacement in Cargo.lock at line 1641 [6.1030385]
B:BD[5.40718] → [5.40718:40743]
```
 "redox_syscall 0.5.18",
```
[5.40718]
[5.40743]
```
 "redox_syscall 0.6.0",
```

Insertion in Cargo.lock at line 1853 [6.1030385]

[5.46079]

]
[[package]]
name = "ntapi"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
dependencies = [
 "winapi",

Deletion in Cargo.lock at line 1963 [6.1030385]

B:BD[5.48495] → [5.48495:49013]

name = "objc2-cloud-kit"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
dependencies = [
 "bitflags 2.10.0",
 "objc2",
 "objc2-foundation",
]
[[package]]
name = "objc2-core-data"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
dependencies = [
 "objc2",
 "objc2-foundation",
]
[[package]]

Deletion in Cargo.lock at line 1969 [6.1030385]
B:BD[5.49242] → [5.49242:49266]
```
 "dispatch2",
 "objc2",
```

Deletion in Cargo.lock at line 1972 [6.1030385]

B:BD[5.49281] → [5.49281:50395]

name = "objc2-core-graphics"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
dependencies = [
 "bitflags 2.10.0",
 "dispatch2",
 "objc2",
 "objc2-core-foundation",
 "objc2-io-surface",
]
[[package]]
name = "objc2-core-image"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
dependencies = [
 "objc2",
 "objc2-foundation",
]
[[package]]
name = "objc2-core-location"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
dependencies = [
 "objc2",
 "objc2-foundation",
]
[[package]]
name = "objc2-core-text"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
dependencies = [
 "bitflags 2.10.0",
 "objc2",
 "objc2-core-foundation",
 "objc2-core-graphics",
]
[[package]]

Deletion in Cargo.lock at line 1976 [6.1030385]

B:BD[5.50578] → [5.50578:50873]


[[package]]
name = "objc2-foundation"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
 "bitflags 2.10.0",
 "block2",
 "libc",
 "objc2",
 "objc2-core-foundation",
]

Deletion in Cargo.lock at line 1978 [6.1030385]

B:BD[5.50886] → [5.50886:52199]

name = "objc2-io-surface"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
dependencies = [
 "bitflags 2.10.0",
 "objc2",
 "objc2-core-foundation",
]
[[package]]
name = "objc2-quartz-core"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
 "bitflags 2.10.0",
 "objc2",
 "objc2-core-foundation",
 "objc2-foundation",
]
[[package]]
name = "objc2-ui-kit"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
dependencies = [
 "bitflags 2.10.0",
 "block2",
 "objc2",
 "objc2-cloud-kit",
 "objc2-core-data",
 "objc2-core-foundation",
 "objc2-core-graphics",
 "objc2-core-image",
 "objc2-core-location",
 "objc2-core-text",
 "objc2-foundation",
 "objc2-quartz-core",
 "objc2-user-notifications",
]
[[package]]
name = "objc2-user-notifications"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
dependencies = [
 "objc2",
 "objc2-foundation",
]
[[package]]

Deletion in Cargo.lock at line 2060 [6.1030385]

B:BD[5.54277] → [5.54277:54622]

name = "os_info"
version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c39b5918402d564846d5aba164c09a66cc88d232179dfd3e3c619a25a268392"
dependencies = [
 "android_system_properties",
 "log",
 "nix 0.30.1",
 "objc2",
 "objc2-foundation",
 "objc2-ui-kit",
 "serde",
 "windows-sys 0.61.2",
]
[[package]]

Replacement in Cargo.lock at line 2343 [6.1030385]
B:BD[5.60148] → [5.60148:60167]
```
version = "1.11.1"
```
[5.60148]
[5.60167]
```
version = "1.12.0"
```

Replacement in Cargo.lock at line 2345 [6.1030385]

B:BD[5.60232] → [5.60232:60310]

checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"

[5.60232]

[5.60310]

checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd"

Insertion in Cargo.lock at line 2531 [6.1030385]

[5.64888]

name = "redox_syscall"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec96166dafa0886eb81fe1c0a388bece180fbef2135f97c1e2cf8302e74b43b5"
dependencies = [
 "bitflags 2.10.0",
]
[[package]]

Replacement in Cargo.lock at line 2651 [6.1030385]
B:BD[5.67335] → [5.67335:67353]
```
version = "1.1.2"
```
[5.67335]
[5.67353]
```
version = "1.1.3"
```

Replacement in Cargo.lock at line 2653 [6.1030385]

B:BD[5.67418] → [5.67418:67496]

checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"

[5.67418]

[5.67496]

checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"

Replacement in Cargo.lock at line 2679 [6.1030385]
B:BD[5.68059] → [5.68059:68078]
```
version = "1.0.20"
```
[5.68059]
[5.68078]
```
version = "1.0.21"
```

Replacement in Cargo.lock at line 2681 [6.1030385]

B:BD[5.68143] → [5.68143:68221]

checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"

[5.68143]

[5.68221]

checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea"

Replacement in Cargo.lock at line 2811 [6.1030385]
B:BD[5.71372] → [5.71372:71392]
```
version = "1.0.145"
```
[5.71372]
[5.71392]
```
version = "1.0.147"
```

Replacement in Cargo.lock at line 2813 [6.1030385]

B:BD[5.71457] → [5.71457:71535]

checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"

[5.71457]

[5.71535]

checksum = "6af14725505314343e673e9ecb7cd7e8a36aa9791eb936235a3567cc31447ae4"

Deletion in Cargo.lock at line 2817 [6.1030385]
B:BD[5.71572] → [5.71572:71580]
```
 "ryu",
```
Insertion in Cargo.lock at line 2819 [6.1030385]
[5.71605]
[5.71605]
```
 "zmij",
```
Replacement in Cargo.lock at line 2833 [6.1030385]
B:BD[5.71869] → [5.71869:71887]
```
version = "1.0.3"
```
[5.71869]
[5.71887]
```
version = "1.0.4"
```

Replacement in Cargo.lock at line 2835 [6.1030385]

B:BD[5.71952] → [5.71952:72030]

checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"

[5.71952]

[5.72030]

checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"

Replacement in Cargo.lock at line 2878 [6.1030385]
B:BD[5.72908] → [5.72908:72926]
```
version = "1.1.0"
```
[5.72908]
[5.72926]
```
version = "1.1.1"
```

Replacement in Cargo.lock at line 2880 [6.1030385]

B:BD[5.72991] → [5.72991:73069]

checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"

[5.72991]

[5.73069]

checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77"

Replacement in Cargo.lock at line 2890 [6.1030385]
B:BD[5.73301] → [5.73301:73319]
```
version = "1.4.7"
```
[5.73301]
[5.73319]
```
version = "1.4.8"
```

Replacement in Cargo.lock at line 2892 [6.1030385]

B:BD[5.73384] → [5.73384:73462]

checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"

[5.73384]

[5.73462]

checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"

Insertion in Cargo.lock at line 2894 [6.1030385]
[5.73479]
[5.73479]
```
 "errno 0.3.14",
```
Replacement in Cargo.lock at line 2906 [6.1030385]
B:BD[5.73718] → [5.73718:73736]
```
version = "0.3.7"
```
[5.73718]
[5.73736]
```
version = "0.3.8"
```

Replacement in Cargo.lock at line 2908 [6.1030385]

B:BD[5.73801] → [5.73801:73879]

checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"

[5.73801]

[5.73879]

checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"

Insertion in Cargo.lock at line 2992 [6.1030385]

[5.76226]

]
[[package]]
name = "sysinfo"
version = "0.34.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2"
dependencies = [
 "libc",
 "memchr",
 "ntapi",
 "objc2-core-foundation",
 "windows 0.57.0",

Replacement in Cargo.lock at line 3041 [6.1030385]
B:BD[5.77055] → [5.77055:77074]
```
version = "3.23.0"
```
[5.77055]
[5.77074]
```
version = "3.24.0"
```

Replacement in Cargo.lock at line 3043 [6.1030385]

B:BD[5.77139] → [5.77139:77217]

checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"

[5.77139]

[5.77217]

checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"

Replacement in Cargo.lock at line 3048 [6.1030385]
B:BD[5.77281] → [5.77281:77298]
```
 "rustix 1.1.2",
```
[5.77281]
[5.77298]
```
 "rustix 1.1.3",
```
Replacement in Cargo.lock at line 3297 [6.1030385]
B:BD[5.82740] → [5.82740:82758]
```
version = "0.9.8"
```
[5.82740]
[5.82758]
```
version = "0.9.10+spec-1.1.0"
```

Replacement in Cargo.lock at line 3299 [6.1030385]

B:BD[5.82823] → [5.82823:82901]

checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"

[5.82823]

[5.82901]

checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"

Replacement in Cargo.lock at line 3302 [6.1030385]

B:BD[5.82933] → [5.82933:82981]

 "serde_spanned 1.0.3",
 "toml_datetime 0.7.3",

[5.82933]

[5.82981]

 "serde_spanned 1.0.4",
 "toml_datetime 0.7.5+spec-1.1.0",

Replacement in Cargo.lock at line 3318 [6.1030385]
B:BD[5.83262] → [5.83262:83280]
```
version = "0.7.3"
```
[5.83262]
[5.83280]
```
version = "0.7.5+spec-1.1.0"
```

Replacement in Cargo.lock at line 3320 [6.1030385]

B:BD[5.83345] → [5.83345:83423]

checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"

[5.83345]

[5.83423]

checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"

Replacement in Cargo.lock at line 3347 [6.1030385]
B:BD[5.83997] → [5.83997:84015]
```
version = "1.0.4"
```
[5.83997]
[5.84015]
```
version = "1.0.6+spec-1.1.0"
```

Replacement in Cargo.lock at line 3349 [6.1030385]

B:BD[5.84080] → [5.84080:84158]

checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"

[5.84080]

[5.84158]

checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"

Replacement in Cargo.lock at line 3359 [6.1030385]
B:BD[5.84385] → [5.84385:84404]
```
version = "0.1.43"
```
[5.84385]
[5.84404]
```
version = "0.1.44"
```

Replacement in Cargo.lock at line 3361 [6.1030385]

B:BD[5.84469] → [5.84469:84547]

checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"

[5.84469]

[5.84547]

checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"

Replacement in Cargo.lock at line 3369 [6.1030385]
B:BD[5.84639] → [5.84639:84658]
```
version = "0.1.35"
```
[5.84639]
[5.84658]
```
version = "0.1.36"
```

Replacement in Cargo.lock at line 3371 [6.1030385]

B:BD[5.84723] → [5.84723:84801]

checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"

[5.84723]

[5.84801]

checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"

Insertion in Cargo.lock at line 3678 [6.1030385]

[5.92816]

name = "windows"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
dependencies = [
 "windows-core",
 "windows-targets 0.52.6",
]
[[package]]
name = "windows-core"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
dependencies = [
 "windows-implement",
 "windows-interface",
 "windows-result",
 "windows-targets 0.52.6",
]
[[package]]
name = "windows-implement"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]
[[package]]
name = "windows-interface"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]
[[package]]

Insertion in Cargo.lock at line 3728 [6.1030385]

[5.93012]

name = "windows-result"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
dependencies = [
 "windows-targets 0.52.6",
]
[[package]]

Replacement in Cargo.lock at line 4062 [6.1030385]
B:BD[5.103231] → [5.103231:103248]
```
 "rustix 1.1.2",
```
[5.103231]
[5.103248]
```
 "rustix 1.1.3",
```
Replacement in Cargo.lock at line 4141 [6.1030385]
B:BD[5.105024] → [5.105024:105042]
```
version = "1.8.2"
```
[5.105024]
[5.105042]
```
version = "1.3.0"
```

Replacement in Cargo.lock at line 4143 [6.1030385]

B:BD[5.105107] → [5.105107:105185]

checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"

[5.105107]

[5.105185]

checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"

Insertion in Cargo.lock at line 4191 [6.1030385]

[5.106226]


[[package]]
name = "zmij"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0095ecd462946aa3927d9297b63ef82fb9a5316d7a37d134eeb36e58228615a"

Fixing conflicts

Dependencies

In channels

Change contents

File deletion: Cargo.lock, Cargo.lock

Resurrecting zombie bytes in pijul/Cargo.toml at line 18 [6.196374]

Resurrecting zombie bytes in pijul/Cargo.toml at line 39 [6.196374]

Deletion in Cargo.lock at line 49 [6.1030385]

Replacement in Cargo.lock at line 145 [6.1030385]

Replacement in Cargo.lock at line 147 [6.1030385]

Replacement in Cargo.lock at line 274 [6.1030385]

Replacement in Cargo.lock at line 276 [6.1030385]

Replacement in Cargo.lock at line 298 [6.1030385]

Replacement in Cargo.lock at line 300 [6.1030385]

Replacement in Cargo.lock at line 374 [6.1030385]

Replacement in Cargo.lock at line 376 [6.1030385]

Replacement in Cargo.lock at line 411 [6.1030385]

Replacement in Cargo.lock at line 554 [6.1030385]

Replacement in Cargo.lock at line 556 [6.1030385]

Replacement in Cargo.lock at line 574 [6.1030385]

Replacement in Cargo.lock at line 576 [6.1030385]

Replacement in Cargo.lock at line 868 [6.1030385]

Replacement in Cargo.lock at line 870 [6.1030385]

Replacement in Cargo.lock at line 874 [6.1030385]

Replacement in Cargo.lock at line 876 [6.1030385]

Replacement in Cargo.lock at line 1080 [6.1030385]

Replacement in Cargo.lock at line 1082 [6.1030385]

Replacement in Cargo.lock at line 1207 [6.1030385]

Replacement in Cargo.lock at line 1209 [6.1030385]

Deletion in Cargo.lock at line 1214 [6.1030385]

Replacement in Cargo.lock at line 1216 [6.1030385]

Replacement in Cargo.lock at line 1306 [6.1030385]

Replacement in Cargo.lock at line 1308 [6.1030385]

Replacement in Cargo.lock at line 1320 [6.1030385]

Replacement in Cargo.lock at line 1322 [6.1030385]

Replacement in Cargo.lock at line 1460 [6.1030385]

Replacement in Cargo.lock at line 1462 [6.1030385]

Replacement in Cargo.lock at line 1466 [6.1030385]

Replacement in Cargo.lock at line 1468 [6.1030385]

Replacement in Cargo.lock at line 1481 [6.1030385]

Replacement in Cargo.lock at line 1483 [6.1030385]

Replacement in Cargo.lock at line 1492 [6.1030385]

Replacement in Cargo.lock at line 1494 [6.1030385]

Replacement in Cargo.lock at line 1560 [6.1030385]

Replacement in Cargo.lock at line 1562 [6.1030385]

Replacement in Cargo.lock at line 1569 [6.1030385]

Replacement in Cargo.lock at line 1571 [6.1030385]

Replacement in Cargo.lock at line 1635 [6.1030385]

Replacement in Cargo.lock at line 1637 [6.1030385]

Replacement in Cargo.lock at line 1641 [6.1030385]

Insertion in Cargo.lock at line 1853 [6.1030385]

Deletion in Cargo.lock at line 1963 [6.1030385]

Deletion in Cargo.lock at line 1969 [6.1030385]

Deletion in Cargo.lock at line 1972 [6.1030385]

Deletion in Cargo.lock at line 1976 [6.1030385]

Deletion in Cargo.lock at line 1978 [6.1030385]

Deletion in Cargo.lock at line 2060 [6.1030385]

Replacement in Cargo.lock at line 2343 [6.1030385]

Replacement in Cargo.lock at line 2345 [6.1030385]

Insertion in Cargo.lock at line 2531 [6.1030385]

Replacement in Cargo.lock at line 2651 [6.1030385]

Replacement in Cargo.lock at line 2653 [6.1030385]

Replacement in Cargo.lock at line 2679 [6.1030385]

Replacement in Cargo.lock at line 2681 [6.1030385]

Replacement in Cargo.lock at line 2811 [6.1030385]

Replacement in Cargo.lock at line 2813 [6.1030385]

Deletion in Cargo.lock at line 2817 [6.1030385]

Insertion in Cargo.lock at line 2819 [6.1030385]

Replacement in Cargo.lock at line 2833 [6.1030385]

Replacement in Cargo.lock at line 2835 [6.1030385]

Replacement in Cargo.lock at line 2878 [6.1030385]

Replacement in Cargo.lock at line 2880 [6.1030385]

Replacement in Cargo.lock at line 2890 [6.1030385]

Replacement in Cargo.lock at line 2892 [6.1030385]

Insertion in Cargo.lock at line 2894 [6.1030385]

Replacement in Cargo.lock at line 2906 [6.1030385]

Replacement in Cargo.lock at line 2908 [6.1030385]

Insertion in Cargo.lock at line 2992 [6.1030385]

Replacement in Cargo.lock at line 3041 [6.1030385]

Replacement in Cargo.lock at line 3043 [6.1030385]