From 1b74cba077bdf72dc584590ac697f2e4adaff442 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Wed, 4 Jun 2014 03:10:31 +0000
Subject: [PATCH] Initialize merging from the trunk

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