(I merge conflicts by inline markers too, which might mean that like you I'm simply Too Old. But for a vanilla diff Meld is pure win.)