Make using alternative merge tool work by pressing the shift key
commit228114f8bec1ded7028c8ff66ba011cdc42e23ba
authorSven Strickroth <email@cs-ware.de>
Tue, 2 Aug 2016 20:23:13 +0000 (2 22:23 +0200)
committerSven Strickroth <email@cs-ware.de>
Tue, 2 Aug 2016 20:23:50 +0000 (2 22:23 +0200)
tree675d7750b20e8aff7f66c42da4f81f53bd4e242c
parent2eb339c0c82d39810aa75142f1a8fc749227edcf
Make using alternative merge tool work by pressing the shift key

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/Git/GitStatusListCtrl.cpp
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/AppUtils.h
src/TortoiseShell/ContextMenu.cpp