diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/uitext.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index 1220b13..8dbc164 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -284,6 +284,7 @@ let interact prilist rilist = -> diff.direction <- Replica2ToReplica1; true | {replicas = Different ({direction = Replica2ToReplica1} as diff)} -> diff.direction <- Replica1ToReplica2; true + | {replicas = Different _} -> false | _ -> true and setDirectionIfConflict dir = function {replicas = Different ({direction = Conflict _})} as ri -> |