libgit2/tests/resources/testrepo/.gitted/objects/9b
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
..
1719f5cf069568785080a0bbabbe7c377e22ae tests: add merge-conflict branch for testrepo 2017-02-13 10:13:02 +01:00