What to show for the hard case when swapping two commits (e.g. using drag and drop)?

Please note that the conflicting file contains already "ours" and "theirs" from Git. We are reluctant to modify these files automatically.

Why not use the existing file table(s) and the Commit view (Window | Commit)?

What about using tags as a temporary workaround?

I just meant, this information is already there, just not in a fancy popup. BTW, when exactly a popup should be shown if a dialog is triggered by the command - should the popup delay showing the dialog?

The menu items should already show the shortcut. Same for the tooltip of a toolbar button.

Hm, for me new (unpushed) commits are shown in different color in the Journal. If that is not the case for you, please send a screenshot to smartgit at syntevo.com illustrating the problem.

The next 25.1 preview build 251045 will remember the reg-ex option.

Please checkout the Standard window and its "My History" view.