Fixed issue #2568: Add Fast Forward Only option to the merge dialog (--ff-only)
commit28f2e5bdf5d00468ecda8544d78d31b07d98b39f
authorHristo Pavlov <hristo_dpavlov@yahoo.com>
Tue, 25 Aug 2015 05:50:03 +0000 (25 15:50 +1000)
committerSven Strickroth <email@cs-ware.de>
Tue, 25 Aug 2015 15:43:45 +0000 (25 17:43 +0200)
tree232bc8b153dd28c8813ff6f3446a705d5c3388b9
parent3cf4587f1374328ad9f428c83505072a5512057b
Fixed issue #2568: Add Fast Forward Only option to the merge dialog (--ff-only)

Signed-off-by: Hristo Pavlov <hristo_dpavlov@yahoo.com>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Languages/Tortoise.pot
src/Changelog.txt
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/MergeDlg.cpp
src/TortoiseProc/MergeDlg.h