diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-19 18:26:04 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:47:47 -0400 |
| commit | 10549a2df166cd3b951c65ab89c33f7ef21c6b7a (patch) | |
| tree | 0bf109c7f9cc662b9912970e757c981bfccc68cc /include/git2/diff.h | |
| parent | 666ae188215557fb440b74f6af6e5cfbec27d459 (diff) | |
| download | libgit2-10549a2df166cd3b951c65ab89c33f7ef21c6b7a.tar.gz | |
Introduce `GIT_DIFF_FLAG_EXISTS`
Mark the `old_file` and `new_file` sides of a delta with a new bit,
`GIT_DIFF_FLAG_EXISTS`, that introduces that a particular side of
the delta exists in the diff.
This is useful for indicating whether a working directory item exists
or not, in the presence of a conflict. Diff users may have previously
used DELETED to determine this information.
Diffstat (limited to 'include/git2/diff.h')
| -rw-r--r-- | include/git2/diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index 7505c08c2..c0d42e30e 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -226,6 +226,7 @@ typedef enum { GIT_DIFF_FLAG_BINARY = (1u << 0), /**< file(s) treated as binary data */ GIT_DIFF_FLAG_NOT_BINARY = (1u << 1), /**< file(s) treated as text data */ GIT_DIFF_FLAG_VALID_ID = (1u << 2), /**< `id` value is known correct */ + GIT_DIFF_FLAG_EXISTS = (1u << 3), /**< file exists at this side of the delta */ } git_diff_flag_t; /** |