| commit | 95c2eae395d94a4e8f98b1e894187ecdf58031a4 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Wed, 23 Nov 2016 12:18:07 +0000 (23 13:18 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 23 Nov 2016 12:18:07 +0000 (23 13:18 +0100) | ||
| tree | 5fa309e327a9b0fa14415a8d5ee05d09d0503fae | treesnapshot (tar.gz zip) |
| parent | 784e0c067e96135f697b439a3c940fb75f98e7ef | commitdiff |
Fixed issue #2872: Rebase local/remote reversed for tree conflicts
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/TortoiseProc/AppUtils.cpp | diffblobblamehistory |