rearrange the prompt a bit, putting all the scm stuff on one line and suppressing that line if it's blank