tree 1c40739041c22a20f202eaf0bab64d8517f04ad4
parent 95f795f40a5d75c2c14c03c1b74cf1ee8816dbf8
author Roozbeh Pournader <roozbeh@google.com> 1387616658 -0800
committer Behdad Esfahbod <behdad@behdad.org> 1387744405 -0500

Properly merge head.flags and OS/2.fsType

Also install the merge script.