Fix assertion
commit3ab664caf1c12e6ac2744df0c16c181b7b7df62d
authorSven Strickroth <email@cs-ware.de>
Wed, 20 May 2015 22:38:47 +0000 (21 00:38 +0200)
committerSven Strickroth <email@cs-ware.de>
Wed, 20 May 2015 22:38:47 +0000 (21 00:38 +0200)
treef01ba0e113b99f9d476ea77ca0f4fe8290f42485
parentc368e75c162e6cea0d2bbbdd5edd7d224974c933
Fix assertion

Fixes a regression introduced in revision dc9f3aa95da02cb38073c32956123bdeb5f7c80a.

Based on TortoiseSVN revision 26524.

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