[1995239 views]

[]

Odi's astoundingly incomplete notes

New entries | Code

interactive diff merge on the console

To quickly compare and merge files ver1 and ver2 and save the result as merged:
sdiff -s -o merged ver1 ver2
It's the command that Gentoo's etc-update uses.
posted on 2014-09-18 18:20 UTC in Code | 0 comments | permalink