libgit2/tests/resources/testrepo/.gitted
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
..
logs/refs/heads tests: add worktree test data 2017-02-13 10:13:02 +01:00
objects tests: add merge-conflict branch for testrepo 2017-02-13 10:13:02 +01:00
refs tests: add merge-conflict branch for testrepo 2017-02-13 10:13:02 +01:00
worktrees/testrepo-worktree tests: add worktree test data 2017-02-13 10:13:02 +01:00
config Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
HEAD Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
HEAD_TRACKER Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
index Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
packed-refs Rename tests-clar to tests 2013-11-14 14:05:52 -08:00