3 ms·
I agree. I find that unified diffs work well 90% of the time but when it doesn't it can be crippling. I've attached some screenshots at http://screenshots.gi
by sdesol 13y ago
I agree. I find that unified diffs work well 90% of the time but when it doesn't it can be crippling. I've attached some screenshots at
http://screenshots.gitsense.com/index.html http://screenshots.gitsense.com/index.html
that illustrates where side by side becomes a requirement for me. Yeah I can make sense of things with a unified view but the side by side really makes things more obvious.
Note you can find this diff at github at https://github.com/joyent/node/pull/5615/files#L0L80 https://github.com/joyent/node/pull/5615/files#L0L80
- jervisfm 13y agoWhat program or tool were you using to see the diffs side by side ?
- sdesol 13y agoIt's from my tool that I've been developing. You can see how the diffing works at https://www.youtube.com/watch?v=fi7GvcW1NKA https://www.youtube.com/watch?v=fi7GvcW1NKA Unfortunately I don't show you how to switch to the side by side view. To do this, you just click on the view toggle button at the top left corner of the diff window.
- gcr 13y agoNice Work! That sounds similar to Meld. http://meldmerge.org/ http://meldmerge.org/