Index: user/ngie/more-tests2/cddl
===================================================================
--- user/ngie/more-tests2/cddl	(revision 289178)
+++ user/ngie/more-tests2/cddl	(revision 289179)

Property changes on: user/ngie/more-tests2/cddl
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/cddl:r288944-289172
Index: user/ngie/more-tests2/gnu/lib
===================================================================
--- user/ngie/more-tests2/gnu/lib	(revision 289178)
+++ user/ngie/more-tests2/gnu/lib	(revision 289179)

Property changes on: user/ngie/more-tests2/gnu/lib
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/gnu/lib:r288944-289172
Index: user/ngie/more-tests2/lib/libc
===================================================================
--- user/ngie/more-tests2/lib/libc	(revision 289178)
+++ user/ngie/more-tests2/lib/libc	(revision 289179)

Property changes on: user/ngie/more-tests2/lib/libc
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/lib/libc:r289135-289172
Index: user/ngie/more-tests2/lib/libutil
===================================================================
--- user/ngie/more-tests2/lib/libutil	(revision 289178)
+++ user/ngie/more-tests2/lib/libutil	(revision 289179)

Property changes on: user/ngie/more-tests2/lib/libutil
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/lib/libutil:r288955-289172
Index: user/ngie/more-tests2/sbin
===================================================================
--- user/ngie/more-tests2/sbin	(revision 289178)
+++ user/ngie/more-tests2/sbin	(revision 289179)

Property changes on: user/ngie/more-tests2/sbin
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sbin:r289149-289172
Index: user/ngie/more-tests2/usr.bin/calendar
===================================================================
--- user/ngie/more-tests2/usr.bin/calendar	(revision 289178)
+++ user/ngie/more-tests2/usr.bin/calendar	(revision 289179)

Property changes on: user/ngie/more-tests2/usr.bin/calendar
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.bin/calendar:r288944-289172
Index: user/ngie/more-tests2/usr.bin/mkimg
===================================================================
--- user/ngie/more-tests2/usr.bin/mkimg	(revision 289178)
+++ user/ngie/more-tests2/usr.bin/mkimg	(revision 289179)

Property changes on: user/ngie/more-tests2/usr.bin/mkimg
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.bin/mkimg:r288944-289172