Diff for staged/unstaged changes

Question

I used to use the Version 1.8 of SourceTree for a long time but recently updated to 3.1.2.

While most of the changes are nice, I noticed that the SourceTree Diff View does not distinguish between staged and unstaged changes while merging.

On normal editing hunks or lines can be staged and unstaged at will and when selecting the staged or unstaged version of the file one will see only the staged or unstaged modifications.

Today I realized this is not true while merging. When I start a merge, regardless if the staged or unstaged file is selected the full diff is shown in the diff view.

Did I miss a option or is this possibly a bug?

SourceTree 3.1.2, git 2.21.0.windows.1 (same for 2.22.0.windows.1)

Mike Corsaro · Accepted Answer

Hello! This is 100% a bug (good catch!) and I will file an issue for it ASAP. It will be fixed for the next release (3.2) which should be rolled out in the next few weeks.

Thanks for reporting this!