summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Klingele <git@leonklingele.de>2018-01-02 22:28:11 +0100
committerLeon Klingele <git@leonklingele.de>2018-01-02 22:28:11 +0100
commitf3b8a5ccb98a361d48e9d360624b73c603573e6b (patch)
tree578655ea8dbe113ad8b89cd91474923d3beff6e6
parentfa87656ce19b6c4386823d6eea789bead2b90af1 (diff)
Update wording: Use 'local/remote version' instead of 'left/right screen'
-rw-r--r--README.md4
-rw-r--r--summary.go8
2 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index 5155873..b1706fb 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ The commands have been preset to the following specifications
```
w - show more lines up
s - show more lines down
-a - select left screen
-d - select right screen
+a - use local version
+d - use incoming version
j - scroll down
k - scroll up
diff --git a/summary.go b/summary.go
index 2b003d7..f27360f 100644
--- a/summary.go
+++ b/summary.go
@@ -15,15 +15,15 @@ func printHelp(v *gocui.View) {
instruction := `
w - show more lines up
s - show more lines down
- a - select left screen
- d - select right screen
+ a - use local version
+ d - use incoming version
j - scroll down
k - scroll up
- v - [v]iew orientation
+ v - [v]iew orientation
n - [n]ext conflict
- p - [p]revious conflict
+ p - [p]revious conflict
h | ? - [h]elp
q | Ctrl+c - [q]uit