From a06fe89e8b35dd3d7f3ce4be79dbe8c11cd8a724 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Wed, 23 Nov 2016 04:34:29 +0000
Subject: [PATCH] Property svnmerge-blocked updated

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.2.x@7031 d57e44dd-8a1f-0410-8b47-8ef2f437770f