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. |
||
|---|---|---|
| .. | ||
| 2d89dcf3a7671ac34a8e875bb72fb39bcf14d7 | ||
| 10c3c796e0704361472ecb904413fca0107a25 | ||