Revert diff newline change

salt/utils/stringutils.py

@@ -558,8 +558,6 @@ def get_diff(a, b, *args, **kwargs):
     with unicode on PY2.
     '''
     encoding = ('utf-8', 'latin-1', __salt_system_encoding__)
-    if 'lineterm' not in kwargs:
-        kwargs['lineterm'] = os.linesep
     # Late import to avoid circular import
     import salt.utils.data
     return ''.join(

tests/integration/states/test_file.py

@@ -3755,10 +3755,8 @@ class BlockreplaceTest(ModuleCase, SaltReturnAssertsMixin):
             pillar={'name': name},
         )
         log.error("ret = %s", repr(ret))
-        diff = dedent('''\
-        --- 
-        +++ 
-        @@ -0,0 +1,3 @@
+        diff = '--- \n+++ \n@@ -0,0 +1,3 @@\n'
+        diff += dedent('''\
         +#-- start managed zone --
         +äöü
         +#-- end managed zone --