From 33f29f8759eac42bb5070d8e99e2b59acdf21395 Mon Sep 17 00:00:00 2001
From: Calvin Spealman <ironfroggy@ironfroggy.(none)>
Date: Tue, 11 Dec 2007 15:56:19 -0500
Subject: [PATCH] Fix latent problem with changebranch and restoring working
 copies

---
 bin/changebranch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/changebranch b/bin/changebranch
index b8e347a..db8a483 100755
--- a/bin/changebranch
+++ b/bin/changebranch
@@ -17,7 +17,7 @@ git checkout -b $1 origin/$1
 git checkout $1
 
 if [ `git branch | grep $1.dirty` ]; then
-	git merge $CURBRANCH.dirty
+	git merge $1.dirty
 	git branch -D $1.dirty
 	git reset HEAD^
 fi
-- 
2.11.4.GIT