13.01.2009, 11:08
I've been using SwiftCompare instead of Winmerge
http://www.oorjasoftware.com/
Load up your two files.
They will autoscan for differences.
Click Next Diff or Prev Diff to move to lines which are different.
Click merge difference to right to copy new lines across, one block at a time.
Or Merge Difference to left if your source is on the right side.
Very easy to use, but not impossible to screw up.
Ctrl-z to step back from a change.
You can visually check what's changing as you progress.
What with Hanger Pack, Fortification Pack, Static Aircraft Pack, Ship Pack etc, its becoming essential to know how to merge these files until a Unified Installer version is issued.
http://www.oorjasoftware.com/
Load up your two files.
They will autoscan for differences.
Click Next Diff or Prev Diff to move to lines which are different.
Click merge difference to right to copy new lines across, one block at a time.
Or Merge Difference to left if your source is on the right side.
Very easy to use, but not impossible to screw up.
Ctrl-z to step back from a change.
You can visually check what's changing as you progress.
What with Hanger Pack, Fortification Pack, Static Aircraft Pack, Ship Pack etc, its becoming essential to know how to merge these files until a Unified Installer version is issued.