Index: stable/6/usr.bin/whereis/whereis.c
===================================================================
--- stable/6/usr.bin/whereis/whereis.c	(revision 179991)
+++ stable/6/usr.bin/whereis/whereis.c	(revision 179992)

Property changes on: stable/6/usr.bin/whereis/whereis.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,1 +0,0 ##
   Reverse-merged /head/usr.bin/whereis/whereis.c:r165854,179888
Index: stable/6/usr.bin/whereis
===================================================================
--- stable/6/usr.bin/whereis	(revision 179991)
+++ stable/6/usr.bin/whereis	(revision 179992)

Property changes on: stable/6/usr.bin/whereis
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.bin/whereis:r165854,179888