|
|
|
|
|
|
by schacon
5953 days ago
|
|
|
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. |
|
|
(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.)