Include stdout and stderr for debugging

Include git stderr for conflict-master tags for debugging purposes.