Index: head/tools/regression/bin/sh/builtins/type1.0.stderr =================================================================== --- head/tools/regression/bin/sh/builtins/type1.0.stderr (revision 186081) +++ head/tools/regression/bin/sh/builtins/type1.0.stderr (revision 186082) Property changes on: head/tools/regression/bin/sh/builtins/type1.0.stderr ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,0 +0,0 ## Index: head =================================================================== --- head (revision 186081) +++ head (revision 186082) Property changes on: head ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,1 ## Merged /vendor/resolver/dist:r1540-186081