From f3b8a5ccb98a361d48e9d360624b73c603573e6b Mon Sep 17 00:00:00 2001
From: Leon Klingele <git@leonklingele.de>
Date: Tue, 2 Jan 2018 22:28:11 +0100
Subject: [PATCH] Update wording: Use 'local/remote version' instead of
 'left/right screen'

---
 README.md  | 4 ++--
 summary.go | 8 ++++----
 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