# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1354640895 21600
# Node ID ae22ef7859eb0d2b8ba0edbacfae0e61a0e7bb51
# Parent  d9cc862e6308cd407146b1b5aba14a98ae842f91# Parent  139f30ce463aff06d596f2a6d94708ff2ace2c87
Merge.

diff --git a/.shell.d/50.hg_functions.sh b/.shell.d/50.hg_functions.sh
--- a/.shell.d/50.hg_functions.sh
+++ b/.shell.d/50.hg_functions.sh
@@ -31,7 +31,7 @@ function hg_rebase_all () {
         if [ $? = 0 ] ; then
             echo 'moving on'
         else
-            if [ $out -ne 0 ] ; then
+            if [ $code -ne 0 ] ; then
                 echo "rebase exited with status $out"
                 return 3
             fi