maybe merging patch files was a thing way before git?