merge_helpers.c
9.8 KB
- 
merge: add simple recursive test · 86c8d02cAdd a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict. Edward Thomson committed
Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.