Fixed issue #2429: "Abort merge" should allow to select "git reset --merge"
commitb2e04000ba8542d9bf604ddf87324f7b5ddeaca5
authorSven Strickroth <email@cs-ware.de>
Sat, 1 Jul 2017 18:58:36 +0000 (1 20:58 +0200)
committerSven Strickroth <email@cs-ware.de>
Sat, 1 Jul 2017 18:59:50 +0000 (1 20:59 +0200)
treecb34abffd6b0ba41602ffadd52a455ffb6c8a401
parentfef0129495236be7ee1e97f1d3f6265c8e1ad080
Fixed issue #2429: "Abort merge" should allow to select "git reset --merge"

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/MergeAbortDlg.cpp
src/TortoiseProc/resource.h