Fixed issue #2157: TortoiseGitMerge does not delete temporary files on close (marking...
commitfd85ff1ec9218295d0344dbf3875ec84a4ffe0b9
authorSven Strickroth <email@cs-ware.de>
Sat, 25 Oct 2014 18:52:22 +0000 (25 20:52 +0200)
committerSven Strickroth <email@cs-ware.de>
Fri, 31 Oct 2014 16:40:55 +0000 (31 17:40 +0100)
tree4cdb2ad4329fcc6880a982ba92991ca622552a5a
parent0ae272c2231d72540fda858a2ca045f2812c8dcf
Fixed issue #2157: TortoiseGitMerge does not delete temporary files on close (marking as "resolved" in TGit was necessary)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/MainFrm.h
src/TortoiseMerge/TortoiseMerge.cpp
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/AppUtils.h