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)
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events