Git now diffs with meld correctly.