not using meld for regular diff