Just do not show me SourceTree - I dislike its UI. Sorry. :)

Maybe I'm missing something but Next/Prev buttons do the job for me. Why someone have to *scroll*?

Personally I prefer full text compare tool and never use collapsing in IDE editor too. :)

17.0.3 has gray merge commits already. Thanks! But is there a way to customize the color?

It will be good also to have "Resolve ALL Conflicts" menu command which will work on all files with conflicts. Selecting 3-4 files with conflicts from list of 20-40 modified files is not very easy thing IMHO.

Yep. Good idea.

Thanks but it seems that -Dsmartgit.settings option is not what I think about. I think about shared property file with following behavior - properties specified in shared file will have higher priority over user local property file. So the shared property file will specify just corporate wide properties.

And then we will know all defaults too! :) Now documentation page specifies them not for all parameters.

Then there should be a way to have company wide customization. Maybe just a path to shared property file?

I think that we better keep current 'filtering' and add 'searching' with next/previous sub-commands.

Sorry but I'm quite happy with current SmartGit UI design. If it will be converted to what you describes I will just stop using it.