Fix diff newline error

mkchoi212 · Dec 31, 2017 · 7456d0a · 7456d0a
1 parent 7068c59
commit 7456d0a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/diff.go b/diff.go
@@ -8,6 +8,6 @@ import (
 
 func (c *Conflict) diff() []string {
 	dmp := diffmatchpatch.New()
-	diffs := dmp.DiffMain(strings.Join(c.CurrentLines, "\n"), strings.Join(c.ForeignLines, "\n"), false)
+	diffs := dmp.DiffMain(strings.Join(c.CurrentLines, ""), strings.Join(c.ForeignLines, ""), false)
 	return []string{dmp.DiffPrettyText(diffs)}
 }