From nobody Thu Sep 26 21:13:15 2024 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 4XF5t32Ktnz5XmVV; Thu, 26 Sep 2024 21:13:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XF5t31pL6z4Kcl; Thu, 26 Sep 2024 21:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727385195; 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=W1apw//GmYBfdtlk0qxrNF7YEYy1NB4/UOH12MzZIPE=; b=glCu2UDBq9bzPQlQEyN1Lft6RxI/MvLtyB6iD4DDvzBSW6hBONVW6rLbCjlYTgNY/4sZRc w51i9TVo9XebWOyTpUwB4tY5xHPMBu/E4v0djLadQWJZPrcQvmcNPcMAZR/bakLVEA5MSG rzeW6kulpwuiTIT908pxKTXAOt36Q8952I5x8IxrjlTly8+o40jVu1RcXALfocw7nsjkPP 9KbIl1I1YeLUQNvoBmmygGTPYGICYYO630i1RdBRffmKd0Jm/YHaR2L2YnSDA0rXcjy+zI waUbf1TEmMRR9Jv+vwG62U7f9SOfE1MpfX5gbCIuA0NVN9r5F0FuGqgmbOln/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727385195; 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=W1apw//GmYBfdtlk0qxrNF7YEYy1NB4/UOH12MzZIPE=; b=mizS6OOCg40RKHFctsGVRkHF0c8Gnb4WSv+U/wACeMpa4yYhneYVubiTZJtI/ldNRB+xNQ jy34gaSDrP/VCm6TJpNVrrbFiWHhd+5D7Z5/ipdnbTu4VYZytOlpfiKvfyTLVCe6fgf3XD neyC14EuMJlQb59us2XFGLZQ9DurRHTJquY11hzNjdGOSSZcvSsp/sDoF+s0h+r44xIA5g 143NwoX7W/e3AJE1ruJ41YfcRngjyLeqNcDShUlglGdpUAdI39CdLP+qtP9KvbTjwpD2BK MTP8Dte9+byvwXNlkGO6meo/66dFfk4pz0joZFEaL28saKiGrFFbxZaVIUXqhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727385195; a=rsa-sha256; cv=none; b=cPQD+cKF3ymKFzRnr2rZik/J2jN+QsykIpN3B9nAU+mFvQPFNja/TpgnZQLGpjdvR4VkWf qn9K8XuWxtiZK4BTL19wXIssUBtzv7+96Vm09zRNKxHJ9ssXXXSKfLDOcH3oVeKj6X/+Um l2cOORB04lpqvpE3hAqDaACC0CDFePQraYniN8vK901+TCHVUki9vxp5vLWo85eRcewKJn hxGH776W195pfuDfNoeHlTZvbcfptplAP/jIVfC95FsDeXe6fKLBTsOZ+OHU1/6X/uT5t7 AVYvdQXRQnYGrKM9oBuMsfqhmaFedAjAaQ6iQUnh8q/QM6y0v/FFPKzsrsgmgA== 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 4XF5t31Pdsz1CLd; Thu, 26 Sep 2024 21:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48QLDFLT096498; Thu, 26 Sep 2024 21:13:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48QLDFqi096495; Thu, 26 Sep 2024 21:13:15 GMT (envelope-from git) Date: Thu, 26 Sep 2024 21:13:15 GMT Message-Id: <202409262113.48QLDFqi096495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f10f288faf08 - main - diff3: Remove debugging remnant. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f10f288faf0808ca91aedab6fbb2c82d3a3b6532 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f10f288faf0808ca91aedab6fbb2c82d3a3b6532 commit f10f288faf0808ca91aedab6fbb2c82d3a3b6532 Author: Dag-Erling Smørgrav AuthorDate: 2024-09-26 21:11:02 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-09-26 21:12:39 +0000 diff3: Remove debugging remnant. Fixes: cf73401c4f7a MFC after: 3 weeks --- usr.bin/diff3/diff3.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index f20b1d74678d..39523f6e6b38 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -383,7 +383,6 @@ merge(int m1, int m2) change(3, &d1->new, false); } else if (eflag == EFLAG_OVERLAP) { j = edit(d2, dup, j, DIFF_TYPE1); - printdiff(d2); } d1++; continue;