Update wording: Use 'local/remote version' instead of 'left/right scr…

…een'
mkchoi212 · Jan 2, 2018 · f3b8a5c · f3b8a5c
1 parent fa87656
commit f3b8a5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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