Branko Čibej wrote: > Can someone explain what the purpose of the save_merged flag > in the conflict result struct is? It's used once in our code, > but as far as I can see, the resulting .edited file isn't > actually [used] by the code anywhere.
This area of conflict handling is buggy and incomplete. For example, in conflict_status_walker(): "/* ### Bug: ignores result->save_merged */". - Julian
