You can activate the split view for staged files which make unstaged changes extremely easy to see. Alternatively, you can sort the files by state, then the untracked files become easier to spot.

The sorting is configurable by the user. Please sort by the State column.

Our used GUI library SWT does not support the shared search string. The other problem (the forgotten search string after not-found) I can't reproduce with SmartGit 26.1.

So you want to have a mode where the non-conflicting changes be not colored?

Please create a sample repository with a conflict on merge/rebase and share your expected output.

You may consider selecting View | Separate Working Tree and Index. Then these files occur in separate lists.

This is supported in the Standard window, "All Branches and Tags" view.

It is called "Reveal Commit".

With rebase, I would say, there would not have been a problem. Maybe it just is my limited understanding, but I don't see any reasonable use-case for merging into a feature branch.