| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| trees | ||
| workdir | ||
| files.c | ||
| merge_helpers.c | ||
| merge_helpers.h |
Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| trees | Loading commit data... | |
| workdir | Loading commit data... | |
| files.c | Loading commit data... | |
| merge_helpers.c | Loading commit data... | |
| merge_helpers.h | Loading commit data... |