From 7e8a9eb6035e380cd42afa5bbc810e5c09d13192 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Thu, 21 Apr 2016 00:13:25 +0000
Subject: [PATCH] Restore svnmerge-integrated property

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