libgit2/tests/resources/testrepo/.gitted/refs/heads/merge-conflict
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

2 lines
41 B
Plaintext

a38d028f71eaa590febb7d716b1ca32350cf70da