| commit | 699ea43c9adb4850f08864ac043392977c6fed3b | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sat, 3 Nov 2012 17:12:37 +0000 (3 18:12 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sat, 3 Nov 2012 17:12:37 +0000 (3 18:12 +0100) | ||
| tree | 3f0f135c51cf58db82da22777e442d4c1ec1967a | treesnapshot (tar.gz zip) |
| parent | 6ae38a947ebe0385834d6bcbc80f28b5c1107dc6 | commitdiff |
Do not show conflict resolved dialog from TMerge
(fixes issue #1492)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
(fixes issue #1492)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseMerge/MainFrm.cpp | diffblobblamehistory | |
| src/TortoiseProc/Commands/ResolveCommand.cpp | diffblobblamehistory |