changeset 306:ae22ef7859eb

Merge.
author Augie Fackler <raf@durin42.com>
date Tue, 04 Dec 2012 11:08:15 -0600
parents d9cc862e6308 (diff) 139f30ce463a (current diff)
children e37b00236907
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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