Index: stable/7/usr.bin/shar/shar.sh
===================================================================
--- stable/7/usr.bin/shar/shar.sh	(revision 180002)
+++ stable/7/usr.bin/shar/shar.sh	(revision 180003)

Property changes on: stable/7/usr.bin/shar/shar.sh
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,1 +0,0 ##
   Reverse-merged /head/usr.bin/shar/shar.sh:r173081,179355,179848
Index: stable/7/usr.bin/shar
===================================================================
--- stable/7/usr.bin/shar	(revision 180002)
+++ stable/7/usr.bin/shar	(revision 180003)

Property changes on: stable/7/usr.bin/shar
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.bin/shar:r179848