Wow .. wouldn't it be nice to get the diff lines highlighted in ST3. Then you get theirs/mine option on each line (with an 'all' option of course).
Surely not hard to implement (if it's easy to say, it's easy to code, right??)
Surely not hard to implement (if it's easy to say, it's easy to code, right??)