Rename variables

Current -> Local
Foreign -> Incoming

4 files changed, 16 insertions, 16 deletions

diff --git a/conflict/conflict.go b/conflict/conflict.go
index 2962cae..f254b18 100644
--- a/conflict/conflict.go
+++ b/conflict/conflict.go
@@ -13,10 +13,10 @@ type Conflict struct {
 	Middle       int
 	End          int
 
-	CurrentLines        []string
-	ForeignLines        []string
-	ColoredCurrentLines []string
-	ColoredForeignLines []string
+	LocalLines           []string
+	IncomingLines        []string
+	ColoredLocalLines    []string
+	ColoredIncomingLines []string
 
 	CurrentName string
 	ForeignName string
diff --git a/conflict/parse.go b/conflict/parse.go
index 1807cb7..5194e37 100644
--- a/conflict/parse.go
+++ b/conflict/parse.go
@@ -24,7 +24,7 @@ func (c *Conflict) SyntaxHighlight() error {
 	var lexer chroma.Lexer
 
 	if lexer = lexers.Match(c.FileName); lexer == nil {
-		for _, block := range [][]string{c.CurrentLines, c.ForeignLines} {
+		for _, block := range [][]string{c.LocalLines, c.IncomingLines} {
 			fmt.Print(strings.Join(block, "\n"))
 			if trial := lexers.Analyse(strings.Join(block, "")); trial != nil {
 				lexer = trial
@@ -35,8 +35,8 @@ func (c *Conflict) SyntaxHighlight() error {
 
 	if lexer == nil {
 		lexer = lexers.Fallback
-		c.ColoredCurrentLines = c.CurrentLines
-		c.ColoredForeignLines = c.ForeignLines
+		c.ColoredLocalLines = c.LocalLines
+		c.ColoredIncomingLines = c.IncomingLines
 		return nil
 	}
 
@@ -48,7 +48,7 @@ func (c *Conflict) SyntaxHighlight() error {
 	buf := new(bytes.Buffer)
 
 tokenizer:
-	for i, block := range [][]string{c.CurrentLines, c.ForeignLines} {
+	for i, block := range [][]string{c.LocalLines, c.IncomingLines} {
 		for _, line := range block {
 			if it, err = lexer.Tokenise(nil, line); err != nil {
 				break tokenizer
@@ -58,9 +58,9 @@ tokenizer:
 			}
 
 			if i == 0 {
-				c.ColoredCurrentLines = append(c.ColoredCurrentLines, buf.String())
+				c.ColoredLocalLines = append(c.ColoredLocalLines, buf.String())
 			} else {
-				c.ColoredForeignLines = append(c.ColoredForeignLines, buf.String())
+				c.ColoredIncomingLines = append(c.ColoredIncomingLines, buf.String())
 			}
 			buf.Reset()
 		}
@@ -102,8 +102,8 @@ func (c *Conflict) ExtractLines() error {
 	}
 
 	lines, _ = FileLines[c.AbsolutePath]
-	c.CurrentLines = lines[c.Start : c.Middle-1]
-	c.ForeignLines = lines[c.Middle : c.End-1]
+	c.LocalLines = lines[c.Start : c.Middle-1]
+	c.IncomingLines = lines[c.Middle : c.End-1]
 	c.CurrentName = strings.Split(lines[c.Start-1], " ")[1]
 	c.ForeignName = strings.Split(lines[c.End-1], " ")[1]
 	return nil
diff --git a/layout.go b/layout.go
index d215d6f..c3afbcb 100644
--- a/layout.go
+++ b/layout.go
@@ -175,7 +175,7 @@ func Select(c *conflict.Conflict, g *gocui.Gui, showHelp bool) error {
 		if c.DisplayDiff {
 			printLines(v, c.Diff())
 		} else {
-			printLines(v, c.ColoredCurrentLines)
+			printLines(v, c.ColoredLocalLines)
 		}
 		printLines(v, bottom)
 		if c.Choice == Local {
@@ -191,7 +191,7 @@ func Select(c *conflict.Conflict, g *gocui.Gui, showHelp bool) error {
 		top, bottom = c.PaddingLines()
 		v.Clear()
 		printLines(v, top)
-		printLines(v, c.ColoredForeignLines)
+		printLines(v, c.ColoredIncomingLines)
 		printLines(v, bottom)
 		if c.Choice == Incoming {
 			v.FgColor = gocui.ColorGreen
diff --git a/summary.go b/summary.go
index e680556..2b003d7 100644
--- a/summary.go
+++ b/summary.go
@@ -81,9 +81,9 @@ func FinalizeChanges(absPath string) (err error) {
 
 	for _, c := range targetConflicts {
 		if c.Choice == Local {
-			replacementLines = append([]string{}, c.CurrentLines...)
+			replacementLines = append([]string{}, c.LocalLines...)
 		} else {
-			replacementLines = append([]string{}, c.ForeignLines...)
+			replacementLines = append([]string{}, c.IncomingLines...)
 		}
 
 		i := 0