| commit | c41f3d342054c07ecfb90891f652a815260f79f0 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Tue, 29 Jul 2014 12:54:40 +0000 (29 14:54 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Tue, 29 Jul 2014 12:54:40 +0000 (29 14:54 +0200) | ||
| tree | e9293bfa4c02556db10ebe988820c0de4c3b1dde | treesnapshot (tar.gz zip) |
| parent | 77b9506638366f7e108fe1b5a70b2deff9b9ee12 | commitdiff |
Sync markedlines stuff with TortoiseMerge
Based on TortoiseMerge revision #25712.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Based on TortoiseMerge revision #25712.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseMerge/BaseView.cpp | diffblobblamehistory | |
| src/TortoiseMerge/Undo.cpp | diffblobblamehistory | |
| src/TortoiseMerge/Undo.h | diffblobblamehistory |