Re: svn commit: r250463 - head/usr.sbin/mergemaster

2013-05-10 Thread Garrett Cooper
On Fri, May 10, 2013 at 12:32 PM, Eitan Adler wrote: ... > Yes, sorry for not including the PR number. No worries :). Thanks for the fix! -Garrett ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsu

Re: svn commit: r250463 - head/usr.sbin/mergemaster

2013-05-10 Thread Eitan Adler
On 10 May 2013 15:09, Garrett Cooper wrote: > 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 >> >>

Re: svn commit: r250463 - head/usr.sbin/mergemaster

2013-05-10 Thread Garrett Cooper
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 > > M

svn commit: r250463 - head/usr.sbin/mergemaster

2013-05-10 Thread Eitan Adler
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.s