diff options
| author | G.raud <graud@gmx.com> | 2018-02-04 07:55:14 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-04 11:37:23 +0100 |
| commit | d2dbe303c57c0f3d144adfbbca83223ce10c6af8 (patch) | |
| tree | fa0d71fc7f7fd92d56b8102ebd353d71f6c919c0 | |
| parent | a7da919e539bd52c3da7401baca5b1bd2da3b578 (diff) | |
| download | unison-d2dbe303c57c0f3d144adfbbca83223ce10c6af8.zip unison-d2dbe303c57c0f3d144adfbbca83223ce10c6af8.tar.gz unison-d2dbe303c57c0f3d144adfbbca83223ce10c6af8.tar.bz2 | |
Uitext: new action "changed" to resolve to the detriment of props changes
| -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 () -> |