|
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.
|
|
bd9f4fd2
|
2015-11-11T10:54:08
|
|
tests: add worktree test data
|
|
60561d54
|
2015-02-03T03:36:07
|
|
tests: update for new test data
|
|
17820381
|
2013-11-14T14:05:52
|
|
Rename tests-clar to tests
|