When using Branch|Merge from the project window and SmartGit/Hg detects that a fast-forward merge will be possible, it will ask you whether to do so. The same happens when using Branch|Merge from the Log.
解决方案
When using Branch|Merge from the project window and SmartGit/Hg detects that a fast-forward merge will be possible, it will ask you whether to do so. The same happens when using Branch|Merge from the Log.