@MadCompie Why do you think is diffmerge better then Meld? I viewed some videos and diffmerge seems not to be as intuitive because you need to use the buttons in top navigation bar. In Meld you have the buttons on the side of every differing line and you are able to choose in which direction you want to apply something. To jump to the next diff you only need to place the mouse cursor in the middle and use the scroll wheel.
-- <http://forum.pspad.com/read.php?2,64632,64970> PSPad freeware editor http://www.pspad.com
