From nobody Mon Aug 01 13:15:30 2022 X-Original-To: dev-commits-src-main@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 4LxJX30tYcz4XkFL; Mon, 1 Aug 2022 13:15:31 +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 4LxJX30LsKz40r7; Mon, 1 Aug 2022 13:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659359731; 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=4H5TP995gPuHjK8+xKd+FrtztzkIr+4Vr9ebXHvWWLM=; b=gUUkrtDIeChUQmCYHxp2yXIl9xvHQII/pDLa6bOYpToZEPvYvQkYPMJcCMsyBdLYWEe9P7 Fj0xYMBsbvIzBB8EhjWAKMZ9csDunHCFo8OvNREZUSgraNCS5fP6hduf9ltQloUdwSvTND l2CjRRBvn27kVpu/5r4/3XKl4ugoHxxItzXWTF8lbw2yXB8uGSXr+9dbBtEO3oHZjKyJLj lpGQ8/7Ttx/Ksywqf9BTsgHLJS61O/frgUcd7sRkh0YnX/8HKFOEyJ72XHRhpeSTWdvGnJ Cwa+S75sgjllTpRnCapuTP2LAGQfswOFSgrWJLkIK6Hu43ESurnL6uNzwG1Tsw== 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 4LxJX26VhhzZTl; Mon, 1 Aug 2022 13:15:30 +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 271DFULg043399; Mon, 1 Aug 2022 13:15:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 271DFUl2043398; Mon, 1 Aug 2022 13:15:30 GMT (envelope-from git) Date: Mon, 1 Aug 2022 13:15:30 GMT Message-Id: <202208011315.271DFUl2043398@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: 85d92faf434a - main - diff3: Fix indentation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 85d92faf434ac8b336d09dfbce5c324fa53c4bc1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659359731; 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=4H5TP995gPuHjK8+xKd+FrtztzkIr+4Vr9ebXHvWWLM=; b=hy5gkCwV9PvbTkb8P2jWBavQhpQlMVmesJzUWB6t4Y5NiFbGSdhKrvzAtxaZYCSwxUd0Lc S68V1ZvnLAOB9TF9FfdKy8yE6ncuOKeeIDQLHPo5pq1bo68W2JPT8e0b4sh5jug6970jbu QzdQzR/Xl06KC0KlZcnLdIxP5DRWh9eifU+GNpRIgtGaK5lA7kfOJ+IY6DIUG7RfKx1iJc dWiZYaMm83y5BY9pChaulimldJq6AedeklwsPVYl6EJ2mwC08SX3HfHT61ZXaJgc7K0FHS 8Ny4PVBZrqKERP7hEKRQ5T5s5VpF6nmMtc8q4N8Z9fFwtTEDvxaQRGWZW+Tv1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659359731; a=rsa-sha256; cv=none; b=HUjrXP0wr6elVpsOS+b9hW+jLmL4ENXNYTDu4HAetmjqz64+8XhrzC5jDJARO1JYhXLF4y +cm4SW9yjL2Iu+GLJeLHkydfauB2CMakKVgYIsaEIfOvb5oK78RcjPxukeAEmhvOzRs/dZ 6fXNWLx73UECgWRu8vY1TAzew3GEqM7uccg2we5WLcld+xf6UZgHkHX6PZJQ/LOPHz/VKn SYXjfg7GE4bXmHkVgLfBYo5G/fSMiG/nfH6wiURswc26aDs792eOg81QjBPSRzGicxZT9X wisTNc9YnVnydQ7yEKENaV5xHQA1GwAsIO79PrcNt632jKhZGKcrgUeBAmWfTg== 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=85d92faf434ac8b336d09dfbce5c324fa53c4bc1 commit 85d92faf434ac8b336d09dfbce5c324fa53c4bc1 Author: Tom Jones AuthorDate: 2022-08-01 13:14:25 +0000 Commit: Tom Jones CommitDate: 2022-08-01 13:14:25 +0000 diff3: Fix indentation Sponsored by: Klara, Inc. --- usr.bin/diff3/diff3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 514e78c79ed6..f3058e0d5c4e 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -570,7 +570,7 @@ printrange(FILE *p, struct range *r) return; if (r->from > r->to) - errx(EXIT_FAILURE, "invalid print range"); + errx(EXIT_FAILURE, "invalid print range"); /* * XXX-THJ: We read through all of the file for each range printed.