libgit2/tests/resources/testrepo/.gitted/objects/ad
Patrick Steinhardt 8acc3b16ef tests: add merge-conflict branch for testrepo
Add a new branch that causes a merge conflict to `testrepo` so
that we are able to test merging in worktrees.
2017-02-13 10:13:02 +01:00
..
edac69457183c8265c8a9614c1c4fed31d1ff3 tests: add merge-conflict branch for testrepo 2017-02-13 10:13:02 +01:00