Permalink
Browse files

Fix message

  • Loading branch information...
lennartcl committed Nov 2, 2012
1 parent e918ad3 commit 8b06a19e3a2ffbfbdf2de74e72410945e942b47b
Showing with 1 addition and 1 deletion.
  1. +1 −1 git-is-current
View
@@ -67,7 +67,7 @@ fi
BASE=`git merge-base $MASTER $BRANCH`
DIFF=`git merge-tree $BASE $MASTER $BRANCH`
if echo "$DIFF" | grep -E '^.<<<<<' &>/dev/null; then
- echo -e "$BRANCH is \033[01;32mNOT\033[00m does not conflict with $MASTER"
+ echo -e "$BRANCH \033[01;32mCONFLICTS\033[00m with $MASTER"
exit 1
elif echo "$DIFF" | grep -Ev '^added in' &>/dev/null; then
if [ ! $QUIET ]; then

0 comments on commit 8b06a19

Please sign in to comment.