thodg/libgit2/tests/status

Diff

  • Show log

    Commit

  • Hash : 191e97a0
    Author : Edward Thomson
    Date : 2015-05-18T18:15:17 

    diff conflicts: don't include incorrect ID

Since a diff entry only concerns a single entry, zero the information
for the index side of a conflict.  (The index entry would otherwise
erroneously include the lowest-stage index entry - generally the
ancestor of a conflict.)

Test that during status, the index side of the conflict is empty.

kmx.io     mail     discord kmxgit v0.4.0