Show More
@@ -868,10 +868,7 b' def nearestrebased(repo, rev, state):' | |||||
868 | else: |
|
868 | else: | |
869 | return None |
|
869 | return None | |
870 |
|
870 | |||
871 | def _checkobsrebase(repo, ui, |
|
871 | def _checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs, rebaseobsskipped): | |
872 | rebaseobsrevs, |
|
|||
873 | rebasesetrevs, |
|
|||
874 | rebaseobsskipped): |
|
|||
875 | """ |
|
872 | """ | |
876 | Abort if rebase will create divergence or rebase is noop because of markers |
|
873 | Abort if rebase will create divergence or rebase is noop because of markers | |
877 |
|
874 |
General Comments 0
You need to be logged in to leave comments.
Login now