phil.freehackers.org
A utility to handle diffing and merging of files or directories. It also deals with CVS conflicts and will perhaps handle other type of conflicts (diff3, patch).
A utility to handle diffing and merging of files or directories. It also deals with CVS conflicts and will perhaps handle other type of conflicts (diff3, patch).