MergeDlg: squash and noff as mutually exclusive
commit6c50f18d5fb6e6d0a384ed15b1f03194230669ff
authorSven Strickroth <email@cs-ware.de>
Thu, 24 Nov 2016 05:01:11 +0000 (24 06:01 +0100)
committerSven Strickroth <email@cs-ware.de>
Thu, 24 Nov 2016 05:01:11 +0000 (24 06:01 +0100)
tree73c1400039ca6f4c0426ef5c8b7a3e35d31e6f5a
parent3ae735ec1d9212a7082e517a0382eea592c94615
MergeDlg: squash and noff as mutually exclusive

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