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

..

index.c

leaks: fix some leaks in the tests

2016-03-31 10:41:33 -04:00

iterator_helpers.c

tests: use a size_t

2016-07-24 15:49:19 -04:00

iterator_helpers.h

tests: use a size_t

2016-07-24 15:49:19 -04:00

tree.c

leaks: fix some leaks in the tests

2016-03-31 10:41:33 -04:00

workdir.c

tests: add merge-conflict branch for testrepo

2017-02-13 10:13:02 +01:00