Date: Wed, 13 Jun 2001 23:20:38 -0400 From: James <James_Bond_79@yahoo.com> To: dougb@freebsd.org Cc: freebsd-hackers@freebsd.org Subject: Re: mergmaster bug Message-ID: <01061323203803.00417@Halstead007> In-Reply-To: <01061323145802.00417@Halstead007> References: <01061323145802.00417@Halstead007>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
Sorry, line wrapped attached diff file as attachement this time.
James
[-- Attachment #2 --]
--- mergemaster.sh.orig Wed Jun 13 20:08:01 2001
+++ mergemaster.sh Wed Jun 13 21:09:54 2001
@@ -471,7 +471,7 @@
echo ' *** Press [Enter] or [Return] key to continue'
read ANY_KEY
unset ANY_KEY
- diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in /etc" | ${PAGER}
+ diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER}
echo ''
echo ' *** Press [Enter] or [Return] key to continue'
read ANY_KEY
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?01061323203803.00417>