dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.

[profile] / dot / e16-bindings

diff --git a/dot/e16-bindings b/dot/e16-bindings
index ebb44ce..4252cb7 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -40,11 +40,13 @@ KeyDown    5      Tab focus next
 KeyDown    5     plus desk next
 KeyDown    5    minus desk prev
 KeyDown   C5        a desk arrange
+KeyDown   C5        c exec xsetroot -cursor_name left_ptr
 KeyDown   C5        f wop * fullscreen
 KeyDown   C5        g magwin show
 KeyDown   C5        h wop * tw available
 KeyDown   C5        i wop * iconify
 KeyDown   C5        k wop * kill
+KeyDown          C5        l exec xrepaint -a
 KeyDown   C5        m wop * ts available
 KeyDown   C5        r wop * shade
 KeyDown   C5        s wop * stick