you know, the meld/p4merge style side by side diff views have always been rather confusing to me. i've been trying to learn to use vimdiff for merge conflicts lately and it's just not as intuitive to me as inline conflict markers. i'm really more of a fan of the inline diff for some reason.
Comments
Upvoted, but I was hoping for something with a little more of Meld and a little less of color-coded diff -u.
We've just added a Meld/IntelliJ style diff to FishEye 2.2, e.g., http://sandbox.fisheye.atlassian.com/browse/rails/actionpack...
you know, the meld/p4merge style side by side diff views have always been rather confusing to me. i've been trying to learn to use vimdiff for merge conflicts lately and it's just not as intuitive to me as inline conflict markers. i'm really more of a fan of the inline diff for some reason.
Maybe you don't have a monitor big enough? :)
(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.)