| commit | c0df8897316e7d7273146fbe14feb3e862c00ec7 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Mon, 1 Aug 2016 12:42:06 +0000 (1 14:42 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Mon, 1 Aug 2016 12:42:06 +0000 (1 14:42 +0200) | ||
| tree | 5bc14f4e25301e29a2ca5fd8e68d1af732e984ac | treesnapshot (tar.gz zip) |
| parent | 2ed934b8d564daf6cfb801697248243634c860dd | commitdiff |
Fixed issue #2809: TortoiseGitMerge: Block Control Button is always disabled on conflict resolution
Based on TortoiseSVN rev. 27383.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Based on TortoiseSVN rev. 27383.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/Resources/ribbon.mfcribbon-ms | diffblobblamehistory |