Merge branch 'rs/apply-symlinks-use-strset'

[thirdparty/git.git] / apply.h

diff --git a/apply.h b/apply.h
index 1f959c064e305a5686a95726f264d147a49c20fe..4052da50c0658cf6434b262bba6f557459e7950c 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -53,6 +53,7 @@ struct apply_state {
        int threeway;
        int unidiff_zero;
        int unsafe_paths;
+       int allow_empty;
 
        /* Other non boolean parameters */
        struct repository *repo;