cleanMerge can't handle git pull --rebase

[rcmiller]

Students sometimes have automatic rebase enabled, so that git pull actually does git pull --rebase. This exercise doesn't handle that possibility.