thodg/libgit2/tests/merge/trees

Diff

  • Show log

    Commit

  • Hash : 185b0d08
    Author : Edward Thomson
    Date : 2018-01-20T19:41:28

    merge: recursive uses larger conflict markers Git uses longer conflict markers in the recursive merge base - two more than the default (thus, 9 character long conflict markers). This allows users to tell the difference between the recursive merge conflicts and conflicts between the ours and theirs branches. This was introduced in git d694a17986a28bbc19e2a6c32404ca24572e400f. Update our tests to expect this as well.

kmx.io     mail     discord kmxgit v0.4.0