]> git.proxmox.com Git - libgit2.git/commit - docs/changelog.md
introduce `git_index_entry_is_conflict`
authorEdward Thomson <ethomson@microsoft.com>
Tue, 19 May 2015 15:23:59 +0000 (11:23 -0400)
committerEdward Thomson <ethomson@microsoft.com>
Thu, 28 May 2015 13:47:31 +0000 (09:47 -0400)
commit9f545b9d71c7bd316be80e5fe8b47135e9deb97e
treed2cf3279b4fd716fcea963a2a0118dd522a52270
parent2f1080ea04ad1235efcd4b213dbe3a1b847644f7
introduce `git_index_entry_is_conflict`

It's not always obvious the mapping between stage level and
conflict-ness.  More importantly, this can lead otherwise sane
people to write constructs like `if (!git_index_entry_stage(entry))`,
which (while technically correct) is unreadable.

Provide a nice method to help avoid such messy thinking.
CHANGELOG.md
include/git2/index.h
src/diff.c
src/index.c
src/iterator.c
src/merge.c
tests/index/conflicts.c
tests/merge/trees/trivial.c
tests/merge/workdir/trivial.c