Show More
@@ -570,9 +570,8 b' def _conflictsmsg(repo):' | |||||
570 | unresolvedlist = [f for f in mergestate.unresolved() if m(f)] |
|
570 | unresolvedlist = [f for f in mergestate.unresolved() if m(f)] | |
571 | if unresolvedlist: |
|
571 | if unresolvedlist: | |
572 | mergeliststr = '\n'.join( |
|
572 | mergeliststr = '\n'.join( | |
573 |
[' %s' % |
|
573 | [' %s' % util.pathto(repo.root, pycompat.getcwd(), path) | |
574 | os.path.join(repo.root, path), |
|
574 | for path in unresolvedlist]) | |
575 | pycompat.getcwd()) for path in unresolvedlist]) |
|
|||
576 | msg = _('''Unresolved merge conflicts: |
|
575 | msg = _('''Unresolved merge conflicts: | |
577 |
|
576 | |||
578 | %s |
|
577 | %s |
General Comments 0
You need to be logged in to leave comments.
Login now