equal
deleted
inserted
replaced
884 self._gitcommand(['merge', '--no-commit', revision]) |
884 self._gitcommand(['merge', '--no-commit', revision]) |
885 |
885 |
886 if self.dirty(): |
886 if self.dirty(): |
887 if self._gitstate() != revision: |
887 if self._gitstate() != revision: |
888 dirty = self._gitstate() == self._state[1] or code != 0 |
888 dirty = self._gitstate() == self._state[1] or code != 0 |
889 if _updateprompt(self._ui, self, dirty, self._state[1][:7], revision[:7]): |
889 if _updateprompt(self._ui, self, dirty, |
|
890 self._state[1][:7], revision[:7]): |
890 mergefunc() |
891 mergefunc() |
891 else: |
892 else: |
892 mergefunc() |
893 mergefunc() |
893 |
894 |
894 def push(self, force): |
895 def push(self, force): |