From: Neil Brown <neilb@suse.de>
Date: Tue, 13 Jun 2006 12:56:59 +0000 (+1000)
Subject: Fix typo in to-resolve name
X-Git-Tag: v0.7~19
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=da2bd81f32614e69a9186a69e2534149eea0fff9;p=wiggle.git

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 44fc43f..905091f 100755
--- 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