From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Arne Gangstad Subject: Re: [PATCH] Clarify text filter merge conflict reduction docs Date: Mon, 28 Jun 2010 22:31:29 +0200 Message-ID: <20100628203128.GA10890@pvv.org> References: <20100628080234.GA7134@pvv.org> <0cd82ad22a6f240ebcde0c2f3a437a805dae5668.1277753114.git.eyvind.bernhardsen@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Junio C Hamano , "git@vger.kernel.org List" To: Eyvind Bernhardsen X-From: git-owner@vger.kernel.org Mon Jun 28 22:31:42 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OTKzU-00005g-Rz for gcvg-git-2@lo.gmane.org; Mon, 28 Jun 2010 22:31:41 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754602Ab0F1Ubg (ORCPT ); Mon, 28 Jun 2010 16:31:36 -0400 Received: from decibel.pvv.ntnu.no ([129.241.210.179]:35587 "EHLO decibel.pvv.ntnu.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751278Ab0F1Ubf (ORCPT ); Mon, 28 Jun 2010 16:31:35 -0400 Received: from finnag by decibel.pvv.ntnu.no with local (Exim 4.69) (envelope-from ) id 1OTKzJ-0005Ea-5K; Mon, 28 Jun 2010 22:31:29 +0200 Content-Disposition: inline In-Reply-To: <0cd82ad22a6f240ebcde0c2f3a437a805dae5668.1277753114.git.eyvind.bernhardsen@gmail.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, Jun 28, 2010 at 09:32:50PM +0200, Eyvind Bernhardsen wrote: > How does this look? > > This commit should really be squashed into the first one in the series. > Live and learn, next time I'll add new changes in a new commit and put > it _last_. I'll submit a fixed series once we're happy with the > documentation. Looks good I think! - Finn Arne