Fixes issue #841. Pull dialog should have "no fast-forward" option like the merge...
commita4381c88ce646aaf2c9e99ab97ae4ded31bc248f
authorSven Strickroth <email@cs-ware.de>
Thu, 4 Aug 2011 22:19:05 +0000 (5 00:19 +0200)
committerSven Strickroth <email@cs-ware.de>
Thu, 4 Aug 2011 22:19:05 +0000 (5 00:19 +0200)
treed763470613d5c9f7bc65424c98b91a1e92989097
parent54b9811fcd7cb443772c6eb7720ccd67b9ff0a05
Fixes issue #841. Pull dialog should have "no fast-forward" option like the merge dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/Commands/PullCommand.cpp
src/TortoiseProc/PullFetchDlg.cpp
src/TortoiseProc/PullFetchDlg.h