From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johan Herland <johan@herland.net>
Subject: Re: [PATCH 12/18] Documentation: Preliminary docs on 'git notes merge'
Date: Mon, 4 Oct 2010 17:15:08 +0200
Message-ID: <201010041715.08879.johan@herland.net>
References: <1285719811-10871-1-git-send-email-johan@herland.net> <1285719811-10871-13-git-send-email-johan@herland.net> <4CA6F385.7030207@gmail.com>
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Cc: git@vger.kernel.org, jrnieder@gmail.com, gitster@pobox.com
To: Stephen Boyd <bebarino@gmail.com>
X-From: git-owner@vger.kernel.org Mon Oct 04 17:15:11 2010
Return-path: <git-owner@vger.kernel.org>
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 <git-owner@vger.kernel.org>)
	id 1P2mkw-0007qg-6r
	for gcvg-git-2@lo.gmane.org; Mon, 04 Oct 2010 17:15:10 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756240Ab0JDPPD (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Mon, 4 Oct 2010 11:15:03 -0400
Received: from mail.mailgateway.no ([82.117.37.108]:62014 "EHLO
	mail.mailgateway.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756237Ab0JDPPC (ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 4 Oct 2010 11:15:02 -0400
Received: from dslb-088-073-123-190.pools.arcor-ip.net ([88.73.123.190] helo=epsilon.localnet)
	by mail.mailgateway.no with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.60 (FreeBSD))
	(envelope-from <johan@herland.net>)
	id 1P2mkm-0006Gi-K8; Mon, 04 Oct 2010 17:15:00 +0200
User-Agent: KMail/1.13.2 (Linux/2.6.32-24-generic; KDE/4.4.2; i686; ; )
In-Reply-To: <4CA6F385.7030207@gmail.com>
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/158060>

On Saturday 2. October 2010 10.55.33 Stephen Boyd wrote:
> On 09/28/2010 05:23 PM, Johan Herland wrote:
> > ++
> > +If conflicts arise (and a strategy for automatically resolving
> > +conflicting notes (see the -s/--strategy option) is not given,
> > +the merge fails (TODO).
> 
> Unbalanced '(' here. Can you just drop the first one?

Done. Will be in next iteration.


Thanks,

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net