Fix typo in to-resolve name

To make sure we don't commit with resolving conflicts.

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/p b/p
index 44fc43fc6462ba170fe332bc76e6f732f205f251..905091fdb0cc2bf8412ba30f17f305e4ebf8a426 100755 (executable)
--- a/p
+++ b/p
@@ -423,7 +423,7 @@ case $cmd in
            echo >&2 remove trailing spaces/tabs first !!
 #          exit 1
        fi
-       if [ -s .patches/to-resolv ]
+       if [ -s .patches/to-resolve ]
        then echo "Please resolve outstanding conflicts first with 'p resolve'"
            exit 1
        fi