I could go either way. I've used both where I work, and I haven't found that one works particularly better than the other. In most cases, inline is sufficient, you can get the gist of a change (especially a one line change) just looking at them inline instead of a full side by side window. In the case of a real big, messy, merge-y diff, you're gonna have a rough time with either style.