diff options
| author | G.raud <graud@gmx.com> | 2018-01-28 13:27:29 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-02 20:09:19 +0100 |
| commit | 936e826c7dca20f591485fab8f4a905eb1f11b62 (patch) | |
| tree | 2867142d0fe4f62c24c71e46687d46eefab5825e | |
| parent | 4f518a5ca328853dd9542497bc3f3a00430e440b (diff) | |
| download | unison-936e826c7dca20f591485fab8f4a905eb1f11b62.zip unison-936e826c7dca20f591485fab8f4a905eb1f11b62.tar.gz unison-936e826c7dca20f591485fab8f4a905eb1f11b62.tar.bz2 | |
Uitext: new action "discard"
| -rw-r--r-- | src/uitext.ml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index a2ed9e6..e4c9aea 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -392,6 +392,10 @@ let interact prilist rilist = if not (isConflict dir) then diff.direction <- Conflict "skip requested"; redisplayri(); next())); + (["-"], + ("skip and discard for this session"), + (fun () -> newLine(); + loop prev rest)); ([">";"."], ("propagate from " ^ descr), (fun () -> |