| commit | 854c17699b59fe4cc71326b37cf724843abe268f | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sun, 19 Mar 2017 19:59:18 +0000 (19 20:59 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sun, 19 Mar 2017 19:59:18 +0000 (19 20:59 +0100) | ||
| tree | 1154773fe1638705a48d47461f5a2cd3b6314f12 | treesnapshot (tar.gz zip) |
| parent | 87e54f60eb95fca3c7fb1c3573ba5a72454bdced | commitdiff |
Allow to resolve conflict if at least on conflict file is staged in index
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseIDiff/MainWindow.cpp | diffblobblamehistory | |
| src/TortoiseMerge/MainFrm.cpp | diffblobblamehistory |