Index: user/ngie/more-tests/bin/ls/tests
===================================================================
--- user/ngie/more-tests/bin/ls/tests	(revision 288330)
+++ user/ngie/more-tests/bin/ls/tests	(revision 288331)

Property changes on: user/ngie/more-tests/bin/ls/tests
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,23 ##
   Merged /user/ngie/fix-progs/bin/ls/tests:r281662
   Merged /projects/release-arm-redux/bin/ls/tests:r278203,278595-278597,278610,280643-280650,280652,280655,282539-282546,282548,282553-282557,282564,282566,282570,282573,282587-282593,282596-282607,282615-282616,282624-282629,282631,282633,282635-282640,282642,282647-282648,282653-282654,282656-282657,282659,282662-282667,282682,282691
   Merged /projects/random_number_generator/bin/ls/tests:r254613-256243
   Merged /projects/release-arm64/bin/ls/tests:r281786,281788,281792
   Merged /head/bin/ls/tests:r281414-288328
   Merged /projects/lldb-r201577/bin/ls/tests:r262185-262527
   Merged /projects/elftoolchain-update-r3130/bin/ls/tests:r276164,276167,276170-276172
   Merged /projects/elftoolchain/bin/ls/tests:r260687-261245
   Merged /projects/multi-fibv6/head/bin/ls/tests:r230929-231848
   Merged /projects/ipfw/bin/ls/tests:r267383-272837
   Merged /projects/zfsd/head/bin/ls/tests:r266519,269993
   Merged /projects/pf/head/bin/ls/tests:r263908
   Merged /projects/building-blocks/bin/ls/tests:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673
   Merged /projects/clang-sparc64/bin/ls/tests:r262258-262612
   Merged /user/delphij/zfs-arc-rebase/bin/ls/tests:r281754
   Merged /projects/release-embedded/bin/ls/tests:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Merged /projects/largeSMP/bin/ls/tests:r221273-222812,222815-223757
   Merged /projects/clang350-import/bin/ls/tests:r274961-275126,275128-275133,275135-276476
   Merged /vendor/resolver/dist/bin/ls/tests:r1540-186085
   Merged /projects/clang360-import/bin/ls/tests:r277327-280030
   Merged /projects/quota64/bin/ls/tests:r184125-207707
   Merged /projects/pms/bin/ls/tests:r285199-285661
   Merged /projects/head_mfi/bin/ls/tests:r233621
Index: user/ngie/more-tests
===================================================================
--- user/ngie/more-tests	(revision 288330)
+++ user/ngie/more-tests	(revision 288331)

Property changes on: user/ngie/more-tests
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r288329-288330