commit 4aad44d77785e284349ceb5ca9c5a3883909818a
Author: Yi Cheng <wisechengyi@gmail.com>
Date:   Sat Jun 22 19:59:33 2019 -0700

    Add --post-compile-merge-dir option in zinc (#7917)
    
    Prerequisite for #7869, so resources like
    ```
    META-INF/services/
    META-INF/services/javax.annotation.processing.Processor
    ```
    in the z.jar can be added by zinc wrapper instead of post processing by Pants.

 src/scala/org/pantsbuild/zinc/compiler/Main.scala     | 6 ++++++
 src/scala/org/pantsbuild/zinc/compiler/Settings.scala | 7 +++++++
 2 files changed, 13 insertions(+)