| commit | ae660d8cf1be0ca10d47e2d5861441679f7661a9 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Wed, 3 Aug 2016 17:55:34 +0000 (3 19:55 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 3 Aug 2016 17:55:34 +0000 (3 19:55 +0200) | ||
| tree | 1dcdd433f6fef5865b3061604fc2b6605583257b | treesnapshot (tar.gz zip) |
| parent | f12ce944dbad77c29440f3dcfb581a097cafe15b | commitdiff |
Stash pop: Show exclamation mark icon in case of conflicts
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseProc/AppUtils.cpp | diffblobblamehistory |