Don't start merging if there are uncommitted changes

Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3

scripts/automerge7.sh

@@ -67,6 +67,14 @@ maybe_commit_and_push() {
         pushMerged
 }
 
+nothingToCommit=`git status | grep "nothing to commit"`
+if [ "$nothingToCommit" == "" ]
+then
+	git status
+	echo "Can not merge when there are unstaged changes."
+	exit 1;
+fi 
+
 git checkout $TO
 git fetch