Skip to content

Commit

Permalink
Add newlines to git output
Browse files Browse the repository at this point in the history
  • Loading branch information
jdmansour committed Apr 20, 2022
1 parent 1c5fcbb commit 599b7a4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nbgitpuller/pull.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)"):
Expand Down

0 comments on commit 599b7a4

Please sign in to comment.