Doesn't difftastic address to given sensible 'what really changed' diffs - e.g. in 1.2.3 it could show the changes made to accomodate the merge without showing the merge changes themselves? -Rob