Make the script display the status of the merge

2015-01-22 13:52:14 +01:00
parent d27b7f8e37
commit 3f8fc6b829
1 changed files with 1 additions and 1 deletions
@@ -31,7 +31,7 @@ fi
 trap 'echo "(aborting the merge now)" && git merge --abort' EXIT

 echo ".. Test merging of the branch \"$branch\"..."
-git merge --quiet --no-commit "$branch"
+git merge --no-commit "$branch" && git status && git diff --staged --summary

 if true; then # REMOVE
 echo '.. Testing permissions...'