moving changes from Windows 95 to Windows NT involved manually doing three-way merges for all of the files that changed since the last drop. I suspect that this manual process was largely automated, but it was not as simple as a git merge.
The first release of git was in 2005, around a decade after Windows 95.
The first release of git was in 2005, around a decade after Windows 95.