Re: mergmaster bug

2001-06-13 Thread James
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 -

mergmaster bug

2001-06-13 Thread James
Just noticed a small bug in mergemaster: When using specifying the destdir with -D and in verbose mode, mergemaster will not properly display the list of files that are only in ${DESTDIR}/etc, because the diff has /etc hardcoded. See the diff below. While on the mergemaster topic, I have seen