equal
deleted
inserted
replaced
437 mergestatemod.mergestate.read(repo).unresolved() |
437 mergestatemod.mergestate.read(repo).unresolved() |
438 ): |
438 ): |
439 raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") |
439 raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") |
440 if not revs: |
440 if not revs: |
441 raise error.Abort( |
441 raise error.Abort( |
442 b'no changesets specified', hint=b'use --rev or --working-dir' |
442 b'no changesets specified', hint=b'use --source or --working-dir' |
443 ) |
443 ) |
444 return revs |
444 return revs |
445 |
445 |
446 |
446 |
447 def checkfixablectx(ui, repo, ctx): |
447 def checkfixablectx(ui, repo, ctx): |