From 1ceca3671e5256a1d4a3b7b7f8d9fae590f9bc6a Mon Sep 17 00:00:00 2001
From: Calvin Spealman <ironfroggy@ironfroggy.(none)>
Date: Mon, 19 Nov 2007 23:09:39 -0500
Subject: [PATCH] actually do what the last commit promised

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

diff --git a/bin/mergefrommaster b/bin/mergefrommaster
index 31a9196..eb7b6aa 100755
--- a/bin/mergefrommaster
+++ b/bin/mergefrommaster
@@ -3,7 +3,7 @@
 
 CURBRANCH=`currentbranchname`
 
-MESSAGE=$(ls .mergefrommastermessage >/dev/null && cat .mergefrommastermessage)
+MESSAGE=$(ls .mergefrommastermessage 2>/dev/null && cat .mergefrommastermessage)
 if ( test $MESSAGE ); then
 	git commit -m $MESSAGE
 	rm .mergefrommastermessage
-- 
2.11.4.GIT