Introduce a flag to control cstyle failures in auto merge script (#55)
Introduce a flag to control cstyle failures in auto merge script (#55)

Introduce -s flag to control if a cstyle failure should cause
the merge process to fail. Corrected some style as well.

Signed-off-by: Giuseppe Di Natale <8f90fd86203578c7bda52281540dd9a2276d6d80@llnl.gov>
zfsonlinux/zfs-buildbot,gmelikov/zfs-buildbot,gmelikov/zfs-buildbot,zfsonlinux/zfs-buildbot