resolves #188: git-ship with no shippable changes

@kevgo 

Will separate all the other error tests of git-ship after this does in.
This file isn't shared between branches. It is committed two times separately in two different branches. A more appropriate name would be something like "simultaneously_committed".