Trying a new diff'ing algorithm
kdiff3 is the default merge tool