| commit | e1bcc4914f1ee12ebe5a18ac0e3bfb43dedf6c04 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sat, 8 Jul 2017 12:01:33 +0000 (8 14:01 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sat, 8 Jul 2017 14:52:21 +0000 (8 16:52 +0200) | ||
| tree | b54fd7933e5c62d7ae449fe19dc036dd5ac97ae5 | treesnapshot (tar.gz zip) |
| parent | 2c94ee2958510b4ec06a78d5d50d9d48ccad926e | commitdiff |
Improve conflict resolving
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseProc/AppUtils.cpp | diffblobblamehistory |