thodg/libgit2/tests/index/conflicts.h

Tag - branch -mainkmx/mainorigin/HEADorigin/bindings/libgit2sharp/022_1origin/brianmario/attr-from-treeorigin/brianmario/revwalk-filterorigin/brianmario/trailer-infoorigin/brianmario/trailer-listorigin/ciorigin/cmn/atexit-skeletonorigin/cmn/cancellationorigin/cmn/commit-onorigin/cmn/ctest-jobsorigin/cmn/delta-base-evictionorigin/cmn/diff-binary-patchorigin/cmn/dynamic-libssh2origin/cmn/example-pullorigin/cmn/forbid-mutiurlorigin/cmn/init-sshorigin/cmn/io-stream-backendsorigin/cmn/leaksorigin/cmn/parallel-clarorigin/cmn/pcre2origin/cmn/read-only-sizeorigin/cmn/remote-optionsorigin/cmn/repo-v1origin/cmn/reset-dont-free-urlorigin/cmn/serverorigin/cmn/sortedcache-closeorigin/cmn/tmporigin/cmn/tree-parser-sort-inputorigin/cmn/warningsorigin/csware/system_proxyorigin/developmentorigin/diff-fails-with-cpp-fileorigin/enterprise/backport-2.6-4136-4178origin/enterprise/backport-2.7-4136-4178origin/enterprise/backport-2.8-4136-4178origin/enterprise/backport-2.9-4136-4178origin/ethomson/027origin/ethomson/checkout_conflict_respect_indexorigin/ethomson/checkout_safetyorigin/ethomson/ci_test_resultsorigin/ethomson/cliorigin/ethomson/cli_cmd_cloneorigin/ethomson/cmakeorigin/ethomson/cmake2origin/ethomson/cmake4origin/ethomson/cmake5origin/ethomson/cmake6origin/ethomson/codespacesorigin/ethomson/diff_failorigin/ethomson/diff_regexp_ignoreorigin/ethomson/docsorigin/ethomson/filter_driver_git_buforigin/ethomson/find_executableorigin/ethomson/fix-stale-filesize-crashorigin/ethomson/follow_redirectsorigin/ethomson/futureorigin/ethomson/init-bakorigin/ethomson/is_and_fromorigin/ethomson/linksorigin/ethomson/middlewareorigin/ethomson/nightliesorigin/ethomson/no_qemuorigin/ethomson/ntlmorigin/ethomson/off_t_bakorigin/ethomson/oid_cleanupsorigin/ethomson/oidmadnessorigin/ethomson/path_validationorigin/ethomson/prng2origin/ethomson/racy-difforigin/ethomson/reference_cmporigin/ethomson/sha256_experimentalorigin/ethomson/sha256_looseorigin/ethomson/sha256_packorigin/ethomson/sha256_raworigin/ethomson/ssl_proxyorigin/ethomson/ssl_refactororigin/ethomson/stream-truncated-writesorigin/ethomson/test_httpsorigin/ethomson/test_urls_with_spacesorigin/ethomson/tlsdata_failorigin/ethomson/url_parseorigin/ethomson/utilorigin/ethomson/util2origin/ethomson/util3origin/ethomson/util4origin/ethomson/util5origin/ethomson/util_as_a_directoryorigin/ethomson/winauthorigin/gh-pagesorigin/jss/fix-ignore-poporigin/mainorigin/maint/v0.21origin/maint/v0.22origin/maint/v0.23origin/maint/v0.24origin/maint/v0.25origin/maint/v0.26origin/maint/v0.27origin/maint/v0.28origin/maint/v0.99origin/maint/v1.0origin/maint/v1.1origin/maint/v1.2origin/maint/v1.3origin/maint/v1.4origin/maint/v1.5origin/pks-cmake-targetsorigin/precompose-testorigin/rb/commit-modified-fileorigin/rb/object-parse-flexibilityorigin/rb/test-builtin-driversorigin/rb/warnings-for-commit-headersorigin/users/ethomson/cmake2origin/vmg/read-typesorigin/vmg/repo-format-1- tag -v1.5.0v1.4.4v1.4.3v1.4.2v1.4.1v1.4.0v1.3.2v1.3.1v1.3.0v1.2.0v1.1.1v1.1.0v1.0.1v1.0.0v0.99.0v0.8.0v0.3.0v0.28.5v0.28.4v0.28.3v0.28.2v0.28.1v0.28.0-rc1v0.28.0v0.27.9v0.27.8v0.27.7v0.27.6v0.27.5v0.27.4v0.27.3v0.27.2v0.27.10v0.27.1v0.27.0-rc3v0.27.0-rc2v0.27.0-rc1v0.27.0v0.26.8v0.26.7v0.26.6v0.26.5v0.26.4v0.26.3v0.26.2v0.26.1v0.26.0-rc2v0.26.0-rc1v0.26.0v0.25.1v0.25.0-rc2v0.25.0-rc1v0.25.0v0.24.6v0.24.5v0.24.4v0.24.3v0.24.2v0.24.1v0.24.0-rc1v0.24.0v0.23.4v0.23.3v0.23.2v0.23.1v0.23.0-rc2v0.23.0-rc1v0.23.0v0.22.3v0.22.2v0.22.1v0.22.0-rc2v0.22.0-rc1v0.22.0v0.21.5v0.21.4v0.21.3v0.21.2v0.21.1v0.21.0-rc2v0.21.0-rc1v0.21.0v0.20.0v0.2.0v0.19.0v0.18.0v0.17.0v0.16.0v0.15.0v0.14.0v0.13.0v0.12.0v0.11.0v0.10.0v0.1.0

• Show log

  Commit

• Hash : 6249d960
  Author :
  Date : 2016-06-29T17:55:44
  

  index: include conflicts in `git_index_read_index` Ensure that we include conflicts when calling `git_index_read_index`, which will remove conflicts in the index that do not exist in the new target, and will add conflicts from the new target.

Download

• tests/index/conflicts.h

• #define CONFLICTS_ONE_ANCESTOR_OID "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81"
  #define CONFLICTS_ONE_OUR_OID "6aea5f295304c36144ad6e9247a291b7f8112399"
  #define CONFLICTS_ONE_THEIR_OID "516bd85f78061e09ccc714561d7b504672cb52da"
  
  #define CONFLICTS_TWO_ANCESTOR_OID "84af62840be1b1c47b778a8a249f3ff45155038c"
  #define CONFLICTS_TWO_OUR_OID "8b3f43d2402825c200f835ca1762413e386fd0b2"
  #define CONFLICTS_TWO_THEIR_OID "220bd62631c8cf7a83ef39c6b94595f00517211e"
  

Download