(self, op_cb=None)
| 981 | self._safe_restore(_stash_msg_merge, restore_fn=restore_fn) |
| 982 | |
| 983 | def merge_continue(self, op_cb=None): |
| 984 | if not self.merge_in_progress: |
| 985 | raise GlError('No merge in progress, nothing to continue') |
| 986 | self._state_cleanup() |
| 987 | restore_fn = op_cb.restore_ok if op_cb else None |
| 988 | self._safe_restore(_stash_msg_merge, restore_fn=restore_fn) |
| 989 | |
| 990 | @property |
| 991 | def merge_in_progress(self): |
nothing calls this directly
no test coverage detected