Rebase: Squash after conflict causes additional commit

By @mrtux on March 03, 2014 16:19 (imported from Google Code)

What version of TortoiseGit and msysgit are you using? On
what operating system?
Win7 x64
TGit 1.7.0
msysgit 1.9.0

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information