From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <mike@fly.osdn.org.ua>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00,
	DNS_FROM_OPENWHOIS autolearn=no version=3.2.5
Date: Mon, 19 Jul 2010 22:20:45 +0300
From: Michael Shigorin <mike@osdn.org.ua>
To: devel-newbies@lists.altlinux.org
Message-ID: <20100719192045.GT17916@osdn.org.ua>
Mail-Followup-To: devel-newbies@lists.altlinux.org
References: <4C449794.6030809@gmail.com>
	<20100719183301.GE6066@wrars-comp.wrarsdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20100719183301.GE6066@wrars-comp.wrarsdomain>
User-Agent: Mutt/1.4.2.1i
Subject: Re: [newbies] is not inherited from
X-BeenThere: devel-newbies@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: "devel@ where you _can_ ask" <devel-newbies@lists.altlinux.org>
List-Id: "devel@ where you _can_ ask" <devel-newbies.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel-newbies>, 
	<mailto:devel-newbies-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel-newbies>
List-Post: <mailto:devel-newbies@lists.altlinux.org>
List-Help: <mailto:devel-newbies-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel-newbies>,
	<mailto:devel-newbies-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jul 2010 19:20:49 -0000
Archived-At: <http://lore.altlinux.org/devel-newbies/20100719192045.GT17916@osdn.org.ua/>
List-Archive: <http://lore.altlinux.org/devel-newbies/>

On Tue, Jul 20, 2010 at 12:33:01AM +0600, Andrey Rahmatullin wrote:
> но формально она исправляется одним мержем.

Возможно, -s ours.

-- 
 ---- WBR, Michael Shigorin <mike@altlinux.ru>
  ------ Linux.Kiev http://www.linux.kiev.ua/