tree bb476f48cc3f7eb0e7f740611f9af8a543b6fd60
parent a68a251b606067f308af1400334b782d2ced3136
parent 4beb774484329254176a2db6bbe237ef0f9f8644
author Jason E Bailey <jeb@apache.org> 1561561898 -0400
committer GitHub <noreply@github.com> 1561561898 -0400
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJdE4sqCRBK7hj4Ov3rIwAAdHIIADiaTmpY1DromFWqYoX1jk/P
 J1upDtnChI1/9wQZuApcIK14jwYsjAKNyNocBI7eDy13xtDt5Rt9SeRFAwPlIcFg
 Y3f0oK6I5/+EO1l94vxS7bdhsacc+6+Rn35ZoDJIl0wXfP5WRvtNnzK/LxfRO/gz
 afsp0q7/zHMxTfidI+9gSSwLMdiaSoraOilTwGRr3M0lP1IACA3mmBhGfEijl6WN
 JoWrTpUmL0qwVaqicCsbPmNqYSN6tK0dDkQQWIBETCux99zGEf/U52lQWthmfAdb
 M6S/SpbdgH+EsGlnn6qNBekAUVFUc5xSNSvysyDkQJW2I6IVMrI7Kwm6VgwtjE4=
 =nCp0
 -----END PGP SIGNATURE-----
 

Merge pull request #1 from apache/SLING-8243

Sling 8243 - support merge options