Include stdout and stderr for debugging
Test error inclusion
Merge pull request #100 from rschlaikjer/include-stderr-in-conflict-details

Include stdout and stderr for debugging