Catch the CMemoryExceptions when loading files in TortoiseMerge
commitec7ab15c45bf5bdb769ac49e902628b35ef05565
authorSven Strickroth <email@cs-ware.de>
Thu, 14 Jun 2012 23:30:52 +0000 (15 01:30 +0200)
committerSven Strickroth <email@cs-ware.de>
Thu, 14 Jun 2012 23:30:52 +0000 (15 01:30 +0200)
treeea086a2114e15c6f714f44c4df73ad7ac8c4ba47
parenta6a52ed03c2a0d9434c04f23b6e62d5151360339
Catch the CMemoryExceptions when loading files in TortoiseMerge

Based on TortoiseSVN revision 22992.

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