diff --git a/nbgitpuller/pull.py b/nbgitpuller/pull.py index 068b8d18..904ed52c 100644 --- a/nbgitpuller/pull.py +++ b/nbgitpuller/pull.py @@ -272,12 +272,12 @@ def merge(self): stderr=subprocess.STDOUT, env={**os.environ, 'LANG': 'C'}).decode().splitlines() for line in lines: - yield line + yield line + '\n' except subprocess.CalledProcessError as exc: lines = exc.output.decode().splitlines() for line in lines: - yield line + yield line + '\n' for line in lines: if line.startswith("CONFLICT (modify/delete)"):