From owner-svn-src-all@FreeBSD.ORG Fri May 10 19:09:56 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A0AEFCB3; Fri, 10 May 2013 19:09:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-vb0-x230.google.com (mail-vb0-x230.google.com [IPv6:2607:f8b0:400c:c02::230]) by mx1.freebsd.org (Postfix) with ESMTP id 30C491FD; Fri, 10 May 2013 19:09:56 +0000 (UTC) Received: by mail-vb0-f48.google.com with SMTP id q16so3741729vbe.35 for ; Fri, 10 May 2013 12:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=+YxFoRWcCfgxmcD00CnCgRs4mV4y732pHY3aRxYjjuc=; b=mGqv59JffPyUojBUwnDy0fXsjrG94v+2hnIWmi+DGk+5W1vt1SxxYq4E4Q4b7h0USY c0RkHzX7ur/l+G8qWZPk64lXcgZ02OprcFfOrRvrqNOu9ZAFSbZo2pbdSa6+IX5zhp8a uVT701EQTm2Dz+YrJT8bZkVl5nZJaZlaNPaWbDUFK/UnIENzSiXrCi94caT5ehRwYYfs GUx+y4LlL87ljWq/fhfiFTTIB9a6hg3nhnWZUUh/vAoCA/NoygRJnNzHBn65jc+qb7bK c++snqEHZLtSCu1f1+RNEhEmTAasJP1Sx+BR8qlp9QYLTNx3dWzmVkLXIg0lV8usz0V1 pl2w== MIME-Version: 1.0 X-Received: by 10.58.90.5 with SMTP id bs5mr11841939veb.60.1368212995737; Fri, 10 May 2013 12:09:55 -0700 (PDT) Received: by 10.220.141.72 with HTTP; Fri, 10 May 2013 12:09:55 -0700 (PDT) In-Reply-To: <201305101742.r4AHgEbQ079103@svn.freebsd.org> References: <201305101742.r4AHgEbQ079103@svn.freebsd.org> Date: Fri, 10 May 2013 12:09:55 -0700 Message-ID: Subject: Re: svn commit: r250463 - head/usr.sbin/mergemaster From: Garrett Cooper To: Eitan Adler Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2013 19:09:56 -0000 On Fri, May 10, 2013 at 10:42 AM, Eitan Adler wrote: > Author: eadler > Date: Fri May 10 17:42:13 2013 > New Revision: 250463 > URL: http://svnweb.freebsd.org/changeset/base/250463 > > Log: > Permit relative paths with mergemaster -m > > Reviewed by: dim, brooks > MFC after: 3 days > > Modified: > head/usr.sbin/mergemaster/mergemaster.sh > > Modified: head/usr.sbin/mergemaster/mergemaster.sh bin/173929 ?