Merge branch 'ls/travis-stricter-linux32-builds'

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 9f353c0efce82e4492b0f3ce3acce1756827462e..fe62e7c775da6a8fc191ed1dc6634d5285ddbc4b 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -978,6 +978,10 @@ test_expect_success '--merged catches invalid object names' '
        test_must_fail git branch --merged 0000000000000000000000000000000000000000
 '
 
+test_expect_success '--merged is incompatible with --no-merged' '
+       test_must_fail git branch --merged HEAD --no-merged HEAD
+'
+
 test_expect_success 'tracking with unexpected .fetch refspec' '
        rm -rf a b c d &&
        git init a &&