mirror of
				https://git.proxmox.com/git/libgit2
				synced 2025-11-04 07:09:14 +00:00 
			
		
		
		
	
				Add a new branch that causes a merge conflict to `testrepo` so that we are able to test merging in worktrees.  | 
			||
|---|---|---|
| .. | ||
| index.c | ||
| iterator_helpers.c | ||
| iterator_helpers.h | ||
| tree.c | ||
| workdir.c | ||