RebaseDlg: Make Pick(Conflict)->Squash not to introduce unwanted commit
commita228ab8f830f2ed658e73c481924f4093ec91af7
authorSven Strickroth <email@cs-ware.de>
Fri, 26 Sep 2014 11:58:02 +0000 (26 13:58 +0200)
committerSven Strickroth <email@cs-ware.de>
Fri, 26 Sep 2014 11:58:39 +0000 (26 13:58 +0200)
treef092f03a9b9cff85c931d95d09785816406fc6c3
parent82d3cd5652707fa42a48462f647d33ec4fccaac7
RebaseDlg: Make Pick(Conflict)->Squash not to introduce unwanted commit

(fixes issue #2126)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseProc/RebaseDlg.cpp
src/TortoiseProc/RebaseDlg.h