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
..
basic.c	tests: add merge-conflict branch for testrepo	2017-02-13 10:13:02 +01:00
hidecb.c	revwalk: port over the topological sorting	2016-10-06 11:04:55 +02:00
mergebase.c	merge: Fix memory leak in test	2015-11-02 13:47:04 +01:00
signatureparsing.c	signature: Strip crud just like Git does	2015-10-21 11:58:44 +02:00
simplify.c	revwalk: get closer to git	2016-10-06 11:04:55 +02:00