diff options
| author | G.raud <graud@gmx.com> | 2018-01-28 13:05:33 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-02 20:09:09 +0100 |
| commit | 89861a921897d97dbaee4a093c225320d2350280 (patch) | |
| tree | fec7ab6098b35aa358ec7f3e2cf7efb33fdb7292 | |
| parent | 823a62b7c8c0be0ab66da2d30cc8f0c6d2a0228f (diff) | |
| download | unison-89861a921897d97dbaee4a093c225320d2350280.zip unison-89861a921897d97dbaee4a093c225320d2350280.tar.gz unison-89861a921897d97dbaee4a093c225320d2350280.tar.bz2 | |
Uitext: new actions "newer" and "older" as in Uigtk2
| -rw-r--r-- | src/uitext.ml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index f5f4196..2ca413d 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -400,6 +400,18 @@ let interact prilist rilist = (fun () -> diff.direction <- Replica2ToReplica1; redisplayri(); + next())); + (["]";"\""], + ("resolve conflicts in favor of the newer file"), + (fun () -> + Recon.setDirection ri `Newer `Prefer; + redisplayri(); + next())); + (["[";"'"], + ("resolve conflicts in favor of the older file"), + (fun () -> + Recon.setDirection ri `Older `Prefer; + redisplayri(); next())) ] (fun () -> displayri ri) |