Searched refs:conflict_resolution (Results 1 – 2 of 2) sorted by relevance
50 enum conflict_resolution enum67 enum conflict_resolution resolution) in log_resolution()
14050 * src/conflicts.c (enum conflict_resolution): Renamed from