| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| trees | ||
| workdir | ||
| conflict_data.h | ||
| driver.c | ||
| files.c | ||
| merge_helpers.c | ||
| merge_helpers.h |
When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT` stop and product a conflict.
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| trees | Loading commit data... | |
| workdir | Loading commit data... | |
| conflict_data.h | Loading commit data... | |
| driver.c | Loading commit data... | |
| files.c | Loading commit data... | |
| merge_helpers.c | Loading commit data... | |
| merge_helpers.h | Loading commit data... |