summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorG.raud <graud@gmx.com>2018-01-28 14:09:51 +0100
committerG.raud <graud@gmx.com>2018-02-02 20:09:45 +0100
commit147c0cac546d075eadae10166ad6d0ce9360b4e9 (patch)
treea82d898753a22d938754058ff50f1ba1f380c59d /src
parent99a0a7df96bd45fa41ff6373ba7af9922f68e084 (diff)
downloadunison-147c0cac546d075eadae10166ad6d0ce9360b4e9.zip
unison-147c0cac546d075eadae10166ad6d0ce9360b4e9.tar.gz
unison-147c0cac546d075eadae10166ad6d0ce9360b4e9.tar.bz2
Uitext: new shortcut to "skip"
The ':' is easier to type than '/' on a french keyboard.
Diffstat (limited to 'src')
-rw-r--r--src/uitext.ml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/uitext.ml b/src/uitext.ml
index 345c919..dead4bc 100644
--- a/src/uitext.ml
+++ b/src/uitext.ml
@@ -390,7 +390,7 @@ let interact prilist rilist =
("exit " ^ Uutil.myName ^ " without propagating any changes"),
(fun () -> newLine();
raise Sys.Break));
- (["/"],
+ (["/";":"],
("skip"),
(fun () ->
if not (isConflict dir) then diff.direction <- Conflict "skip requested";