thodg/libgit2/include

Diff

  • Show log

    Commit

  • Hash : 7c948014
    Author : Edward Thomson
    Date : 2015-05-14T14:00:29

    diff/status: introduce conflicts 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.

kmx.io     mail     discord kmxgit v0.4.0