Sorry, line wrapped attached diff file as attachement this time.

James
--- 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

Reply via email to