mirror of
https://git.proxmox.com/git/libgit2
synced 2025-12-17 06:40:44 +00:00
Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict. |
||
|---|---|---|
| .. | ||
| 7bf85e978f1d18c0566f702d2cb7766b9c8d4f | ||
| 7e08f9559d9e1551b91e1cf68f1d0066109add | ||