Add basic diff command file

mkchoi212 · Jan 1, 2018 · 8f4df34 · 8f4df34
1 parent a17f24e
commit 8f4df34
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/conflict/diff.go b/conflict/diff.go
@@ -0,0 +1,7 @@
+package conflict
+
+func (c *Conflict) Diff() []string {
+	dummyPath := "/Users/mikechoi/src/CSCE-313/"
+	stdout, _, _ := RunCommand("git", dummyPath, "--no-pager", "diff", "--color")
+	return []string{stdout}
+}