3 ms·
You don’t need git to get something “as simple as a git merge” (Diff3 is from 1979 (https://en.wikipedia.org/wiki/Diff3 https://en.wikipedia.org/wiki/Diff3) Di
by Someone 11mo ago
You don’t need git to get something “as simple as a git merge” (Diff3 is from 1979 (https://en.wikipedia.org/wiki/Diff3 https://en.wikipedia.org/wiki/Diff3)
Diff3 is from 1979 (https://en.wikipedia.org/wiki/Diff3 https://en.wikipedia.org/wiki/Diff3), so three-way merges (https://en.wikipedia.org/wiki/Merge_(version_control)#Three-way_merge https://en.wikipedia.org/wiki/Merge_(version_control)#Three-...) predate git by decades.