mirror of
https://git.proxmox.com/git/libgit2
synced 2025-12-17 08:37:51 +00:00
Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict. |
||
|---|---|---|
| .. | ||
| 4e5a16feabbd0335a633aadb8217c9f3dba58d | ||