When diffing against an index, return a new `GIT_DELTA_CONFLICTED`
delta type for items that are conflicted.  For a single file path,
only one delta will be produced (despite the fact that there are
multiple entries in the index).

Index iterators now have the (optional) ability to return conflicts
in the index.  Prior to this change, they would be omitted, and callers
(like diff) would omit conflicted index entries entirely.

If `git_index_remove_bypath` does no work, and returns an OK error
code, it should not set an error message.

When adding a conflict for some path, remove the staged entry.
Otherwise, an illegal index (with both stage 0 and high-stage
entries) would result.

Wrap the iterator current / advance functions so that we can extend
them, but also handle GIT_ITEROVER cases in the iterator funcs
instead of the callers.

Fix ident replacement to match Git behavior

Git inserts a space after the SHA1 (as of 2.1.4 at least), so do the
same.

Thin packs: don't 

When thickening a pack, avoid loading already loaded bases and
trying to insert them all over again.

When creating an index, know that we do not have an index for
our own packfile, preventing some unnecessary file opens and
error reporting.

openssl: don't try to handle WANT_READ or WANT_WRITE

Fix error when building as C++.

index_add_all: include untracked files in new subdirs

No need to get reports about individual ignored files, having a
single ignored directory delta is enough.

ignore: clear the error when matching a pattern negation

When we discover that we want to keep a negative rule, make sure to
clear the error variable, as it we otherwise return whatever was left by
the previous loop iteration.

Our doc parser really wants the types to be declared in the header it's
reading.

Improve server error reporting

This can be used by tools to show mesages about failing to communicate
with the server. The error message in this case will often contain the
server's error message, as far as it managed to send anything.

When we fail to read from stdout, it's typically because the URL was
wrong and the server process has sent some output over its stderr
output.

Read that output and set the error message to whatever we read from it.

Use a diff for iteration in index_update_all and index_add_all

Provide error messages for git_path_direach operations

We set an error if we get an error when reading, but we don't bother
setting an error message for write failing. This causes a cryptic error
to be shown to the user when the target filesystem is full.

Now that `git_path_direach` lets us specify an error message to report,
set an appropriate error message while linking.

This function deals with functions doing IO which means the amount of
errors that can happen is quit large. It does not help if it always
ovewrites the underlying error message with a less understandable
version of "something went wrong".

Instead, only use this generic message if there was no error set by the
callback.

Updated dlibgit link.

Bring Early EOF message in line with the other two

Without this option, we would not be able to catch exec bit changes.

Instead of going through each entry we have and re-adding, which may not
even be correct for certain crlf options and has bad performance, use
the function which performs a diff against the worktree and try to add
and remove files from that list.

Refactor so we look like the code we're replacing, which should also
allow us to more easily inplement add-all.