Fix typo in to-resolve name

To make sure we don't commit with resolving conflicts. Signed-off-by: Neil Brown <[email protected]>
neilbrown · Jun 13, 2006 · da2bd81 · da2bd81
1 parent 74a9b5a
commit da2bd81
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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