thodg/libgit2/tests/resources/testrepo/.gitted/objects/a3/8d028f71eaa590febb7d716b1ca32350cf70da

Show log
Commit
Hash : 8acc3b16
Author :
Date : 2015-11-10T15:53:09

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.