| commit | d361c0338508425b88a04b7bf762e4ccd1f7b472 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Wed, 16 Nov 2011 18:11:01 +0000 (16 19:11 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 16 Nov 2011 18:11:01 +0000 (16 19:11 +0100) | ||
| tree | f6bc4124fa71c5c6365c387d17ab30e49bf0169c | treesnapshot (tar.gz zip) |
| parent | a074c3b42a81f461a7083b9bbfdb8699813aff46 | commitdiff |
Fixed issue #964: Can't mark conflict as resolved
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/Git/GitStatusListCtrl.cpp | diffblobblamehistory |