Three conflicts, all of them a rename this branch and main made
independently. main split FileType into FileType (the POSIX node kind)
and ContentType (a regular file's rendering hint), so a fixture naming
FileType.TEXT becomes FileType.FILE plus ContentType.TEXT; the new
test_wrap.py was not conflicted because it is new here, and named the
member anyway. In config.py this branch generalized _absolutize_cli_ref
into _absolutize_code_ref(entry, key, base) and added the mounts loop
for a resource colon reference, while main added the profiles loop for
a permissions script; both halves are kept.
Zecheng Zhang
e3b5dfc84d