| commit | 8c3299d4a5410dc23c828c0ee85abc06f40f23f4 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sun, 12 Feb 2017 16:56:43 +0000 (12 17:56 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sat, 25 Feb 2017 12:46:45 +0000 (25 13:46 +0100) | ||
| tree | 866a37694720f876137f3df9cd0c7a792fbba1fd | treesnapshot (tar.gz zip) |
| parent | 324057d1bb0ae122ef43d65ee70f01006dc91907 | commitdiff |
SyncDlg: Enable more options for conflict view
Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 7d83bff3c1501512784942b814544f78c57bfa11)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 7d83bff3c1501512784942b814544f78c57bfa11)
| src/TortoiseProc/SyncDlg.cpp | diffblobblamehistory |