What kind of icon do you suggest?

Sorry, I misunderstood you. The incorrectly named "diverged"-warning will be changed to a "behind checkout target" message.

I've changed the request's title so I better understand what I think is requested.

Do you have an suggestion what the base file changes toolbar button icon should show?

Do you know that you can open the base-file changes from the Conflict Solver?

The Journal focuses on the current branch, its remote branch and one additional (auxiliary) branch. This is a very task-orientated view. Useful improvement suggestions that don't turn it into a fully fledged log are welcome (as separate request, please).

I've implemented the renaming now, but the problem of the "git stash store -m 'new message' <stash-id>" is that the stash commits are not touched and hence will be displayed in the log's Commits view with the initial message. Currently, SmartGit also shows the commit's message also in the Branches view, so you will not see a difference after renaming - we'll discuss internally whether this should be considered a bug or not.

Why do you think that they are better? Do you know that you can change (nearly) all shortcuts in SmartGit using Edit|Customize?

The File Compare (standalone window) only lets you edit the file content (no display of different line separators), except of the case of mixed line endings where editing is prevented. Please use Help | Check for Latest Build to get #11105 - then you will find an option to "Ignore Line Separator Changes".

Which exact part?

Well, for that purpose we have created the Changes view...