Add warning about unmerged changes in "shellscripts" branch.

refs #209