| commit | f7ffe36b83d56edff897337b93697de4c3a98886 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sat, 19 Jan 2013 15:58:19 +0000 (19 16:58 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Thu, 7 Feb 2013 08:54:31 +0000 (7 09:54 +0100) | ||
| tree | 5a0ca41653012842d31c7e144408e8bc6e258fff | treesnapshot (tar.gz zip) |
| parent | d27e1709ccdae7f63a30d4c3876ea9762d9ddd6d | commitdiff |
TGitMerge: After saving a conflicted versioned file, ask whether to mark the file as resolved
Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 8acd1ad34c611e1403bb96b78246203e0fecbc2b)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 8acd1ad34c611e1403bb96b78246203e0fecbc2b)
| src/TortoiseMerge/MainFrm.cpp | diffblobblamehistory | |
| src/TortoiseMerge/TortoiseMerge.vcxproj | diffblobblamehistory |