Trim the trailing newline from getSide

Author: mclaughlinconnor

src/MergeDriver.hx

@@ -1,3 +1,4 @@
+import util.TrimTrailingNewline.trimTrailingNewline;
 import diff.util.Side;
 import diff.util.ThreeSide;
 import diff.util.ThreeSide.ThreeSideEnum;
@@ -73,7 +74,7 @@ class MergeDriver {
 		viewer.rediff(false);
 
 		if (sideStr == "base") {
-			return viewer.myModel.getDocument();
+			return trimTrailingNewline(viewer.myModel.getDocument());
 		}
 
 		final side = Side.fromEnum(Side.fromLeft(sideStr == "left"));
@@ -84,7 +85,7 @@ class MergeDriver {
 			}
 		}
 
-		return viewer.myModel.getDocument();
+		return trimTrailingNewline(viewer.myModel.getDocument());
 	}
 
 	/** 

src/util/TrimTrailingNewline.hx

@@ -0,0 +1,9 @@
+package util;
+
+function trimTrailingNewline(string:String):String {
+	if (StringTools.endsWith(string, "\n")) {
+		return string.substring(0, string.length - 1);
+	}
+
+	return string;
+}