Fix nbmerge to use git show in the no-arguments case.
Merge pull request #62 from tarmstrong/fix-nbmerge-no-arguments

Fix nbmerge to use git show in the no-arguments case.