Using unified diff output for puppet-merge when showing submodule diffs

Change-Id: I2ec0f8f0d7f4eabb5029b20664790447bfe2b206