kmx git
login
register
thodg
/
libgit2
/
tests/resources/testrepo/.gitted/refs/heads/merge-conflict
tests/resources/testrepo/.gitted/refs/heads/merge-conflict
Log
Author
Commit
Date
CI
Message
8acc3b16
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.