diff options
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 197a0044a..a2df544d0 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -16,6 +16,8 @@ struct unpack_trees_options { int trivial_merges_only; int verbose_update; int aggressive; + int skip_unmerged; + int gently; const char *prefix; int pos; struct dir_struct *dir; |