[buster]

Ahh, meld. It's awesome! After searching for some good diff (visual) tools, i found that one and never had problems.