Ask git about unmerged files

[stgit] / t / t1203-push-conflict.sh

diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
index f9537d9e599d7f4cf122ee0ae50ea4736598d9dc..57119ab0718915dcc05024b55ba4c3cd9924287f 100755 (executable)
--- a/t/t1203-push-conflict.sh
+++ b/t/t1203-push-conflict.sh
@@ -53,6 +53,12 @@ test_expect_success \
        git diff --cached --stat | grep -q -e "^ test2 | *1 "
        '
 
+test_expect_success \
+       'Check that pop will fail while there are unmerged conflicts' \
+       '
+       ! stg pop
+       '
+
 test_expect_success \
        'Resolve the conflict' \
        '