Using kdiff3? You may want to be aware of this bug: it can make you miss changes