From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35272-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 15159 invoked by alias); 23 May 2015 10:13:10 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 35272
Received: (qmail 12992 invoked from network); 23 May 2015 10:13:05 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2 autolearn=ham
	autolearn_force=no version=3.4.0
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	daniel.shahaf.name; h=content-type:date:from:in-reply-to
	:message-id:mime-version:references:subject:to:x-sasl-enc
	:x-sasl-enc; s=mesmtp; bh=mdZh2i9BAU2w2eG0ESJt+I50XX8=; b=CGInST
	HSeU3KLXKY6tOzLUC00kJrOkfzpzWpLw9pHgnCBwCNcs8W5MFbG91UEqqyD2xgh5
	zqmoLKrISSEWiAxb6SVY5Q2kifoqAw81MUlrvCsDL0c9VjrCkEYla4XD4/0Bd1ce
	ExvLQ1MKF35DG1qZ0vF2/lzvIy6ZbJhFgcb1Y=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	messagingengine.com; h=content-type:date:from:in-reply-to
	:message-id:mime-version:references:subject:to:x-sasl-enc
	:x-sasl-enc; s=smtpout; bh=mdZh2i9BAU2w2eG0ESJt+I50XX8=; b=B+RPz
	BNZjurovsNDu/s7NebyrQygE/K4i2bLXvP2pdV5gZ4rK3AZX9CDrakc8UsEIBgjR
	11Ikc2Ap5btI1lLV1ciDu4YaaT7f2ehB+2YR/UKKL0SVnXcMaypU2yB69awlUvYb
	CVXVL6U1OptusKPH4r1kfaneJoL0NEmrtJGob8=
X-Sasl-enc: uSNVNFMFhdvApzoH5pXO5IrzD33WzRiW8OvXdhwSAjyx 1432375983
Date: Sat, 23 May 2015 10:13:00 +0000
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: Re: Conflict with Jun T's texi2any patch
Message-ID: <20150523101300.GD1889@tarsus.local2>
References: <150522100546.ZM25066@torch.brasslantern.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <150522100546.ZM25066@torch.brasslantern.com>
User-Agent: Mutt/1.5.21 (2010-09-15)

[ This is about git conflicts, not about texinfo. ]

Bart Schaefer wrote on Fri, May 22, 2015 at 10:05:46 -0700:
> This must be something I had left unposted -- I added "makeinfo" fallbacks:
> 
> ++<<<<<<< HEAD
>  +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [makeinfo --pdf])
>  +AC_CHECK_PROGS([TEXI2HTML], [texi2html], [makeinfo --html])
> ++=======
> + AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
> + AC_CHECK_PROGS([TEXI2HTML], [texi2any texi2html], [: texi2html])
> + 
> + if test x"$TEXI2HTML" = xtexi2any; then
> +   TEXI2HTML='texi2any -c TEXI2HTML=1'
> + fi
> + 
> ++>>>>>>> master
> 

I find conflicts easier to resolve when 'git config --global
merge.conflictstyle=diff3' is set: <<< foo ||| bar === baz >>> can then
be resolved by applying to foo the changes that make bar into baz, which
is usually an almost mechanical change.  The two-side form quoted above
lacks bar.

Here's a comparison of the two-sided and three-sided forms:
https://subversion.apache.org/docs/release-notes/1.9#three-way-conflict-markers