changeset 30674 | eb69f78c48ab |
parent 30580 | 51e7c83e05ee |
child 30709 | a932297febb7 |
--- a/hgext/rebase.py Sun Dec 25 02:42:46 2016 +0530 +++ b/hgext/rebase.py Sat Dec 24 15:38:27 2016 -0500 @@ -868,10 +868,7 @@ else: return None -def _checkobsrebase(repo, ui, - rebaseobsrevs, - rebasesetrevs, - rebaseobsskipped): +def _checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs, rebaseobsskipped): """ Abort if rebase will create divergence or rebase is noop because of markers