equal
deleted
inserted
replaced
1097 b'changesets' |
1097 b'changesets' |
1098 ), |
1098 ), |
1099 ) |
1099 ) |
1100 # update to the current working revision |
1100 # update to the current working revision |
1101 # to clear interrupted merge |
1101 # to clear interrupted merge |
1102 hg.updaterepo(repo, rbsrt.originalwd, overwrite=True) |
1102 mergemod.clean_update(repo[rbsrt.originalwd]) |
1103 rbsrt._finishrebase() |
1103 rbsrt._finishrebase() |
1104 return 0 |
1104 return 0 |
1105 elif inmemory: |
1105 elif inmemory: |
1106 try: |
1106 try: |
1107 # in-memory merge doesn't support conflicts, so if we hit any, abort |
1107 # in-memory merge doesn't support conflicts, so if we hit any, abort |