Merge pull request #46 from ViBiOh/smerge

Adding SublimeMerge support

reporters/diff_reporter.go

@@ -21,6 +21,7 @@ func NewDiffReporter() Reporter {
 		NewFileMergeReporter(),
 		NewVSCodeReporter(),
 		NewGoLandReporter(),
+		NewSublimeMergeReporter(),
 		NewRealDiffReporter(),
 		NewPrintSupportedDiffProgramsReporter(),
 		NewQuietReporter(),

reporters/sublime_merge.go

@@ -0,0 +1,12 @@
+package reporters
+
+type sublimeMerge struct{}
+
+// NewSublimeMergeReporter creates a new reporter for the SublimeMerge diff tool.
+func NewSublimeMergeReporter() Reporter {
+	return &sublimeMerge{}
+}
+
+func (s *sublimeMerge) Report(approved, received string) bool {
+	return launchProgram("smerge", approved, "mergetool", received, approved, "-o", approved)
+}