From patchwork Fri Oct 12 21:25:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 10639301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E6FBF933 for ; Fri, 12 Oct 2018 21:26:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEC8E201A4 for ; Fri, 12 Oct 2018 21:26:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C26C82BA2F; Fri, 12 Oct 2018 21:26:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A6EF201A4 for ; Fri, 12 Oct 2018 21:26:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726122AbeJMFAU (ORCPT ); Sat, 13 Oct 2018 01:00:20 -0400 Received: from mx0a-00153501.pphosted.com ([67.231.148.48]:39094 "EHLO mx0a-00153501.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725785AbeJMFAU (ORCPT ); Sat, 13 Oct 2018 01:00:20 -0400 Received: from pps.filterd (m0131697.ppops.net [127.0.0.1]) by mx0a-00153501.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w9CLNeXW011256; Fri, 12 Oct 2018 14:25:55 -0700 Received: from mail.palantir.com ([8.4.231.70]) by mx0a-00153501.pphosted.com with ESMTP id 2mxtwhajtg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK); Fri, 12 Oct 2018 14:25:55 -0700 Received: from sj-prod-exch-02.YOJOE.local (10.160.10.15) by sj-prod-exch-02.YOJOE.local (10.160.10.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1531.3; Fri, 12 Oct 2018 14:25:53 -0700 Received: from EX02-WEST.YOJOE.local (10.160.10.131) by sj-prod-exch-02.YOJOE.local (10.160.10.15) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.1.1531.3 via Frontend Transport; Fri, 12 Oct 2018 14:25:53 -0700 Received: from smtp-transport.yojoe.local (10.129.56.124) by EX02-WEST.YOJOE.local (10.160.10.131) with Microsoft SMTP Server id 14.3.319.2; Fri, 12 Oct 2018 14:25:53 -0700 Received: from newren2-linux.yojoe.local (newren2-linux.pa.palantir.tech [10.100.71.66]) by smtp-transport.yojoe.local (Postfix) with ESMTPS id 623BF209F04D; Fri, 12 Oct 2018 14:25:53 -0700 (PDT) From: Elijah Newren To: CC: , Elijah Newren Subject: [PATCH 0/4] More merge cleanups Date: Fri, 12 Oct 2018 14:25:47 -0700 Message-ID: <20181012212551.7689-1-newren@gmail.com> X-Mailer: git-send-email 2.19.0.235.g7c386e1068 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-10-12_14:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=4 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=410 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810120214 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This series builds on en/merge-cleanup. Technically, this could be broken into three separate topics with only one of them depending on en/merge-cleanup, but I have a subsequent series that depends on both en/merge-cleanup and the fixes here, so I'm submitting these four patches as a set. Elijah Newren (4): t6036: add testcase where virtual merge base contains nested conflicts merge-recursive: increase marker length with depth of recursion Improving diff3 conflict markers in the face of arbitrarily deeply nested conflicts merge-recursive: improve auto-merging messages with path collisions Simple attempt at wording improvement merge-recursive: Avoid showing conflicts with merge branch before HEAD Conflict markers are expected to be shown in a certain order ll-merge.c | 4 +- ll-merge.h | 1 + merge-recursive.c | 59 +++++++++-- t/t6036-recursive-corner-cases.sh | 159 +++++++++++++++++++++++++++++- 4 files changed, 208 insertions(+), 15 deletions(-)