From nobody Mon Aug 1 13:56:46 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LxKRf427rz4Xqd7; Mon, 1 Aug 2022 13:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LxKRf3NSzz45f4; Mon, 1 Aug 2022 13:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659362206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYh1GPV6DccMJPfnJpuVdsGvleD1/c1SE/EngNybpFY=; b=aWAXgbVijWK9A8FggywTpo1WeNKmM9CeLZ78pJM50Uk8Rf6icUQx7i8PEwNYF4W8y+kyO5 0vGNTkDHBfUPQ1SaF4P02/9zbscT+/QpVhb/UJteBO50mYVe7A3+1Hs4lYG1m9rgxB6VgU WMQ5Lw5/2lzl+mlxilVUd9fHBATJstxSzhAp9fGn9P1cdkZ0V2NWJWJvCReJCFRanm+6hO DHiHbWNOfwn7Y1zP1KZX9urNZ9zF193l9KJVXzFLZN8egBktXoArUrIPR5DVHD/VPryKUU YvKut3ckVLgWXUTpBkLxlEhfN7x5czoYrz3cdMSLtbWxAZpvQBsNJQaW1zLDXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LxKRf2KQJzbq9; Mon, 1 Aug 2022 13:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 271DukfM097599; Mon, 1 Aug 2022 13:56:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 271Dukx7097598; Mon, 1 Aug 2022 13:56:46 GMT (envelope-from git) Date: Mon, 1 Aug 2022 13:56:46 GMT Message-Id: <202208011356.271Dukx7097598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: ca53a8445ab3 - main - diff3: Replace literal marker with variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca53a8445ab32987b118011c25c520eedf58881c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659362206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYh1GPV6DccMJPfnJpuVdsGvleD1/c1SE/EngNybpFY=; b=wrBf3UhbWNmopJbjFeEWYZpuy6Bj3ph5GC3bPtKFu0OMmN5g5mPIbs9r8UkyRLkuueNmZm R7lJJS1LuLYDxDqb+1Zzz2Du/tZzN0Jds6s7XasfDgPGcks0c6vS5lfEkDRdhsiyukylxb OagdZlmGbPI34QAlA+PjoI9cyiCh3n0cCzx6/usLwJL9eyrQP/hCMJMGhAydqaocAFojMh 28xDsOY0fvoft4D7A8uvCXbBVo+34hgx/Y7z7PRKVb3FqAW4Lg/q7t1waY65mXU5QSvQie c2QoW6UYCQ1xwMDadv5qNG2mQJCt2JX6Nm/ZMlWADKBrfrYG92fF8uy61xZj7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659362206; a=rsa-sha256; cv=none; b=aPn7iiU7uN2atboVIZhieODZ8Ym5mdhHUgOza6rdfFwprkeORMXMVmdJpsZWQdE73fXowV wUF9J/1A0B+P1TGacTWbWpqgQEQAepW5TlWN1K5BLIaIUKwDuzbYUAh4/cG3cNT1ATbJbO kmtVykNHnNSXm1gNLRx1baysynQBQCogA4Xb+We1p/uYk+fBRvymCo1FBdXuXjrbLDfr8B NMyBky7QcOy8JHVHgRg50+RMYqzHsLsb9cBct7siIZzx35ERGBIwsgcG8c3MAGF6hMsyX0 1S8/I4Iy2Ek/6o57YleD3HHo8QlDv2/e9VCrvrekemyNiXyvi6u+jLfUMy8BHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=ca53a8445ab32987b118011c25c520eedf58881c commit ca53a8445ab32987b118011c25c520eedf58881c Author: Tom Jones AuthorDate: 2022-08-01 13:46:09 +0000 Commit: Tom Jones CommitDate: 2022-08-01 13:53:53 +0000 diff3: Replace literal marker with variable Sponsored by: Klara, Inc. --- usr.bin/diff3/diff3.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index f3058e0d5c4e..7adb9b5c5043 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -144,6 +144,7 @@ static char *f1mark, *f2mark, *f3mark; static const char *oldmark = "<<<<<<<"; static const char *orgmark = "|||||||"; static const char *newmark = ">>>>>>>"; +static const char *divider = "======="; static bool duplicate(struct range *, struct range *); static int edit(struct diff *, bool, int, int); @@ -599,7 +600,7 @@ edscript(int n) prange(&de[n].old, delete); } else { printf("%da\n", de[n].old.to - 1); - printf("=======\n"); + printf("%s\n", divider); } printrange(fp[2], &de[n].new); if (!oflag || !overlap[n]) { @@ -657,7 +658,7 @@ Ascript(int n) printf("%s %s\n", oldmark, f2mark); if (!deleteold) printrange(fp[1], &de[n].old); - printf("=======\n.\n"); + printf("%s\n.\n", divider); } } else if (de[n].type == DIFF_TYPE3) { @@ -676,7 +677,7 @@ Ascript(int n) } else printrange(fp[1], &de[n].old); - printf("=======\n"); + printf("%s\n", divider); printrange(fp[2], &de[n].new); } @@ -724,7 +725,7 @@ mergescript(int i) if (de[n].type == DIFF_TYPE2) { printf("%s %s\n", oldmark, f2mark); printrange(fp[1], &de[n].old); - printf("=======\n"); + printf("%s\n", divider); printrange(fp[2], &de[n].new); printf("%s %s\n", newmark, f3mark); } else if (de[n].type == DIFF_TYPE3) { @@ -744,7 +745,7 @@ mergescript(int i) } else printrange(fp[1], &de[n].old); - printf("=======\n"); + printf("%s\n", divider); printrange(fp[2], &de[n].new); printf("%s %s\n", newmark, f3mark);