okay ... winmerge .. is tht a solution ?