changeset 6098 | 65340b8231eb |
parent 5988 | ee317dbfb9d0 |
child 6130 | 516d8ffede7c |
--- a/mercurial/localrepo.py Wed Feb 13 18:37:38 2008 -0200 +++ b/mercurial/localrepo.py Fri Feb 15 15:44:32 2008 -0200 @@ -1433,7 +1433,7 @@ self.ui.warn(_("abort: push creates new remote branches!\n")) self.ui.status(_("(did you forget to merge?" " use push -f to force)\n")) - return None, 1 + return None, 0 elif inc: self.ui.warn(_("note: unsynced remote changes!\n"))