Fixed issue #1166: Unreadable error message in TortoiseMerge
commit9f88950edb8d85422dbf7659802473ddb0044668
authorSven Strickroth <email@cs-ware.de>
Mon, 11 Jun 2012 04:30:33 +0000 (11 06:30 +0200)
committerSven Strickroth <email@cs-ware.de>
Mon, 11 Jun 2012 04:30:33 +0000 (11 06:30 +0200)
treecda6a2648eefaf5ad23e616fe0930a52acb1d298
parentf8e2430d0c73eb63c0b9506dd68287333be1fd96
Fixed issue #1166: Unreadable error message in TortoiseMerge

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/TortoiseMerge/DiffData.cpp