Refactored: Move conflict resolve code to CAppUtils
commitdfc0b26fad32407baeb9fddb0d750556006f335b
authorSven Strickroth <email@cs-ware.de>
Thu, 30 Oct 2014 18:55:27 +0000 (30 19:55 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 31 Oct 2014 16:56:08 +0000 (31 17:56 +0100)
tree6d4334aa798c6fbedb9ef0c425377e82e4a18408
parentf0481be4c9039d0186f72d7c1c7e90bceec402a0
Refactored: Move conflict resolve code to CAppUtils

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