Received: by mail.netbsd.org (Postfix, from userid 605) id B34C784D7D; Sat, 25 Aug 2018 17:14:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A368F84D75 for ; Sat, 25 Aug 2018 17:14:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id M8goMKYAct48 for ; Sat, 25 Aug 2018 17:14:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2DE6E84C71 for ; Sat, 25 Aug 2018 17:14:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 24FC7FBEC; Sat, 25 Aug 2018 17:14:39 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sat, 25 Aug 2018 17:14:39 +0000 From: "Martin Husemann" Subject: CVS commit: [netbsd-8] src/bin/sh To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20180825171439.24FC7FBEC@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Martin Husemann" Mail-Followup-To: source-changes-d@NetBSD.org List-Unsubscribe: Module Name: src Committed By: martin Date: Sat Aug 25 17:14:39 UTC 2018 Modified Files: src/bin/sh [netbsd-8]: eval.c Log Message: Fix merge mishap due to #983 / #989 pullup order. To generate a diff of this commit: cvs rdiff -u -r1.140.2.6 -r1.140.2.7 src/bin/sh/eval.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.