Problem: replace_region and refresh were local functions, preventing the new merge module from resolving conflicts in working files and updating inline highlights after resolution. Solution: promote both to M.replace_region and M.refresh, update all internal call sites. |
||
|---|---|---|
| .. | ||
| diffs | ||