Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96328
Return-Path: <cmbecker69@gmx.de>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 71650 invoked from network); 12 Oct 2016 14:25:12 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 12 Oct 2016 14:25:12 -0000
Authentication-Results: pb1.pair.com header.from=cmbecker69@gmx.de; sender-id=pass
Authentication-Results: pb1.pair.com smtp.mail=cmbecker69@gmx.de; spf=pass; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmx.de designates 212.227.15.19 as permitted sender)
X-PHP-List-Original-Sender: cmbecker69@gmx.de
X-Host-Fingerprint: 212.227.15.19 mout.gmx.net  
Received: from [212.227.15.19] ([212.227.15.19:64294] helo=mout.gmx.net)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 2E/03-41968-7C74EF75 for <internals@lists.php.net>; Wed, 12 Oct 2016 10:25:11 -0400
Received: from [192.168.2.103] ([79.243.112.45]) by mail.gmx.com (mrgmx003)
 with ESMTPSA (Nemesis) id 0MILxX-1bqkto3ZEt-004G70 for
 <internals@lists.php.net>; Wed, 12 Oct 2016 16:25:07 +0200
X-Mozilla-News-Host: news://news.php.net:119
To: PHP Internals <internals@lists.php.net>
Message-ID: <0e0887f9-f4dc-862b-0427-33c2e8b4d739@gmx.de>
Date: Wed, 12 Oct 2016 16:25:40 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:1vt5MiBL3qp4BzWx3v2m08MDbKXJf6RNXWDrB0W5wfR9DVYFGLg
 rKvZ949/3RC2g8Oymxv5gg6kiAEcN6eM9LiESypmoWThKEC9K9kuhImODueK0KuI73bWGWt
 SGcU7sgVKtXSubOr3Lu+yMSIJcFUjmAXyZbuJEGJ1c99g72A8DcYStzn7RqhmAni6a02Iiv
 3hpYemPtjjAmJACVCm3GQ==
X-UI-Out-Filterresults: notjunk:1;V01:K0:zPPS4nIfJq8=:US/fFqJ3mGuzmA3wzX87Az
 t4FZUYFv9uTFA4ttS3V9YgID9qT7kNg3c/erO+sTF2lSmlSVkEqZ92KIOq48hABEuXu4mlCEk
 RBLpV0pGn9ft2Ed3EwMLyMe8Deo+8/feJCti582mVgX20yy18cHqlsn2gSw0ZfNb9ATzvd/tp
 2wf1hMBZcrOW9RuNCsebocM8/KfL+kNDIu3z8/mkeMPRGSQlgbRUsFkSYoJDLtVO/FgFwnYcO
 4nRo2MI++5bvndkc4J6fuz5MSeomazWtCK6vR1ZBub8knMAxQ8s572d3jbL6RkM4fNCrvloKp
 KZLp1x70b3UUVdHQzrK5uwJH1XgQFYmb3YMO6EKswCmp7D4bKHWsZCA6PSVKx2OVg/pjxtAdq
 bRF4LWYhlIu9jOT7zBg1p5wsVu/uNsdVWKtw8VjT3TtOFlJEKUZz9/hGfrBve7BSLC21QiyhM
 j5UNvUj+bmJGy7EwmhJfFJ2rlgX7HCClvyWkPpJf9JCdUWpVlND4r10ohcxq9Ai0E1CiRbogt
 PjKCL1zcbaxeHPZgw2e+K08yAcWZXvSXse6//KLg+6CWluaUBLoVnzzuG3JrjHautvDtBXPof
 ZLSN1RkS82hEx31rpl9Hpo0m6AUB1ixxOemjDlwNcpIc49h2HjvxFSPXPH/g8pwzDv67J3iAg
 xvUp0conlKiHlDgHUnzY2arw9M6KOAQjs3FFFXy24QSILNDcBL8QSy8odIXRoyPwyt9Ii5AFb
 ImHNkzl33DQ9pfm5c4VutMGqgC4A3vMxB2YLyRZmwlfg6AvSX3yCXkStJGnxBFuLB69SPoeyW
 YUS9JkS
Subject: Merging PHP-5.6 into PHP-7.0 conflicts
From: cmbecker69@gmx.de ("Christoph M. Becker")

Hi!

It seems there has been an unresolved bad merge.  When I attempt an
empty merge from PHP-5.6 into PHP-7.0, Git reports 18 conflicting files.

Can somebody please have a look at this issue.

-- 
Christoph M. Becker