| commit | b5ce86d59fe2d0ead8f34eca23198d089d0836db | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Fri, 15 Apr 2016 15:14:39 +0000 (15 17:14 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Fri, 15 Apr 2016 15:15:12 +0000 (15 17:15 +0200) | ||
| tree | 42ba92306ff57193cc2cb1db5c703e47fe6949d4 | treesnapshot (tar.gz zip) |
| parent | e46742bb2480dc1ad94c390536d7e4f6ce1acea2 | commitdiff |
Fixed issue #2759: Swapped THEIRS and MINE in cherry-pick conflict dialogs and context menus
Regression of commit 36f67adbe1c4eaddc67c9ff9fa3d2a80fabb8029.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Regression of commit 36f67adbe1c4eaddc67c9ff9fa3d2a80fabb8029.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/TortoiseProc/RebaseDlg.cpp | diffblobblamehistory |