diff options
Diffstat (limited to 'include/git2/checkout.h')
| -rw-r--r-- | include/git2/checkout.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h index f026d5bc2..9f834111a 100644 --- a/include/git2/checkout.h +++ b/include/git2/checkout.h @@ -182,7 +182,10 @@ typedef enum { * notifications; don't update the working directory or index. */ GIT_CHECKOUT_DRY_RUN = (1u << 24), - + + /** Include common ancestor data in zdiff3 format for conflicts */ + GIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3 = (1u << 25), + /** * THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED */ |