[Mirror] Some kind of OS: git://git.9front.org/plan9front/plan9front

Ori Bernstein c59eb6d117 merge3: make identical changes merge cleanly ... when making the same change on both the left and right fork, this should not be a merge conflict. Instead, the two changes should merge cleanly.		2024-01-21 02:44:42 +00:00
386
68000
68020
acme	mkfiles: add 'mk test' support	2023-02-19 20:44:56 -05:00
adm/timezone
amd64
arm
arm64
lib	/lib/terry: speak no ill of the dead	2023-12-02 18:16:14 +00:00
mips
power
power64
rc	ethermultilink: ignore link-status of primary	2023-12-07 14:48:49 +00:00
sparc
sparc64
spim	/spim/include/ape/ureg.h: fixed missing ifndef	2023-03-07 04:26:34 +00:00
sys	merge3: make identical changes merge cleanly	2024-01-21 02:44:42 +00:00