Pull: Disable --no-ff when --ff-only is checked and vice versa
commit95cc7e635cc3e680a1099de3858809f79ef71df4
authorSup Yut Sum <ch3cooli@gmail.com>
Sun, 16 Mar 2014 12:10:40 +0000 (16 20:10 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Sun, 16 Mar 2014 12:10:40 +0000 (16 20:10 +0800)
treeca7921059a53ca7bfab63b9114cf0cca2ad1a21b
parentd6a7809358530d1f50567486305d7cd314b9f9bd
Pull: Disable --no-ff when --ff-only is checked and vice versa

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
src/TortoiseProc/PullFetchDlg.cpp
src/TortoiseProc/PullFetchDlg.h