diff options
| author | G.raud <graud@gmx.com> | 2018-02-03 13:54:48 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-03 18:24:28 +0100 |
| commit | 940ce241d64e7fa9dea413fa0f14e6680ffd02a4 (patch) | |
| tree | 3d7a220ed4ca344104bafc230bdbb6974ad27d51 | |
| parent | 3f87f03aad9ee31d607b3e9fc6df2d2facbe0b1d (diff) | |
| download | unison-940ce241d64e7fa9dea413fa0f14e6680ffd02a4.zip unison-940ce241d64e7fa9dea413fa0f14e6680ffd02a4.tar.gz unison-940ce241d64e7fa9dea413fa0f14e6680ffd02a4.tar.bz2 | |
Uitext: prevent action "invert" from going next if direction not inverted
| -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 -> |