Answer accepted stevestreeting Jun 06, 2012 Just select 2 commits in the log at once using Cmd-Click, then you'll see the complete diff between those two commits. If you want to filter things down further you can right-click on a file, click 'Log Selected' to get the history just for that file, and then again multi-select commits in that window. In Mac, when you install Xcode you get a diff tool named FileMerge, simple but sufficient in most of the cases. You can try WinMerge for Windows, I've used it in the past and it's pretty nice, and open source. You can also try the P4 Merge tool from Perforce which is offered for free. Both options can be selected as a Diff/Merge Tool in SourceTree. SourceTree doesn't seem to consistently delete the intermediate files it creates, but you can select, right-click and 'Remove' them from the un-staged file section easily enough.
About
I'm not a big fan of inline diff, it's just not that intuitive for me. So I was wondering if there is side by side diff feature in SourceTree. Sadly there is no inbuilt soulution. The only way to see changes side by side is to open external diff.
Solution
Tony goes through the step of setting up DiffMerge as the conflict tool in SourceTree and how to resolve a merge conflict.DiffMerge: https://sourcegear.com/d.
Sourcetree Patch
I've choose P4Merge as external diff, because it's free and it looks nice.
Sourcetree Diffmerge Not Launching
After P4Merge installation there is only one thing left and that is to open SourceTree and select Tools -> Options -> Diff and set External Diff to P4Merge in dropdown menu.
I'm not a big fan of inline diff, it's just not that intuitive for me. So I was wondering if there is side by side diff feature in SourceTree. Sadly there is no inbuilt soulution. The only way to see changes side by side is to open external diff.
Solution
Tony goes through the step of setting up DiffMerge as the conflict tool in SourceTree and how to resolve a merge conflict.DiffMerge: https://sourcegear.com/d.
Sourcetree Patch
I've choose P4Merge as external diff, because it's free and it looks nice.
Sourcetree Diffmerge Not Launching
After P4Merge installation there is only one thing left and that is to open SourceTree and select Tools -> Options -> Diff and set External Diff to P4Merge in dropdown menu.
Sourcetree Diffmerge
Now whenever I want to check the diff I can select the file in SourceTree and hit Ctrl+D to open P4Merge side by side diff. Acronis true image sabrent.
