From 122ee734ac175ac7874936488efc703f7cb06455 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Fri, 6 Oct 2017 04:45:57 +0000
Subject: [PATCH] svnmerge-integrated corrected

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