diff options
author | Leon Klingele <git@leonklingele.de> | 2018-01-02 22:28:11 +0100 |
---|---|---|
committer | Leon Klingele <git@leonklingele.de> | 2018-01-02 22:28:11 +0100 |
commit | f3b8a5ccb98a361d48e9d360624b73c603573e6b (patch) | |
tree | 578655ea8dbe113ad8b89cd91474923d3beff6e6 | |
parent | fa87656ce19b6c4386823d6eea789bead2b90af1 (diff) |
Update wording: Use 'local/remote version' instead of 'left/right screen'
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | summary.go | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -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
@@ -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 |