diff options
| author | G.raud <graud@gmx.com> | 2018-02-02 17:50:43 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-02 20:43:38 +0100 |
| commit | 1535a849151c2e806a718e79d87c00dfd9492063 (patch) | |
| tree | addaa561102ef239406abdd903834b10962add88 | |
| parent | 03fa8a53b9feae62c517cdc37a484bcf83b9d3c6 (diff) | |
| download | unison-1535a849151c2e806a718e79d87c00dfd9492063.zip unison-1535a849151c2e806a718e79d87c00dfd9492063.tar.gz unison-1535a849151c2e806a718e79d87c00dfd9492063.tar.bz2 | |
Uitext: new actions to match against following items
| -rw-r--r-- | src/uitext.ml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index 96fffa2..dc0af5a 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -384,6 +384,32 @@ let interact prilist rilist = alwaysDisplayDetails ri) ril; repeat())); + (["A"], + ("match all the following"), + (fun () -> newLine(); + ripred := Some (fun _ -> true); + repeat())); + (["C"], + ("match all the following conflicts"), + (fun () -> newLine(); + ripred := Some + (function + {replicas = Different ({direction = Conflict _})} -> true + | _ -> false); + repeat())); + (["M"], + ("match all the following merges"), + (fun () -> newLine(); + ripred := Some + (function + {replicas = Different ({direction = Merge})} -> true + | _ -> false); + repeat())); + (["U"], + ("unmatch all (select current)"), + (fun () -> newLine(); + ripred := None; + repeat())); (["r"], ("revert to " ^ Uutil.myName ^ "'s default recommendation"), (fun () -> |