diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/uitext.ml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index 7dffec8..cd9b99c 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -519,6 +519,12 @@ let interact prilist rilist = ("resolve conflicts in favor of the older (curr or match)"), (fun () -> actOnMatching (setDirectionIfConflict `Older))); + (["c"], + ("resolve conflicts in favor of changed (curr or match)"), + (fun () -> + actOnMatching + ~fail:(Some (fun()->display "Cannot set direction\n")) + setdirchanged)); (["i"], ("invert direction of propagation and go to next item"), (fun () -> |