Merge branch 'jc/rm-submodule-error-message'

Consolidate two messages phrased subtly differently without a good
reason.

* jc/rm-submodule-error-message:
builtin/rm.c: consolidate error reporting for removing submodules

diff --cc builtin/rm.c
Simple merge