Show More
@@ -673,7 +673,8 b' def morestatus(repo, fm):' | |||
|
673 | 673 | statemsg = _('The repository is in an unfinished *%s* state.') % state |
|
674 | 674 | fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label) |
|
675 | 675 | conmsg = _conflictsmsg(repo) |
|
676 | fm.write('conflictsmsg', '%s\n', conmsg, label=label) | |
|
676 | if conmsg: | |
|
677 | fm.write('conflictsmsg', '%s\n', conmsg, label=label) | |
|
677 | 678 | if helpfulmsg: |
|
678 | 679 | helpmsg = helpfulmsg() |
|
679 | 680 | fm.write('helpmsg', '%s\n', helpmsg, label=label) |
General Comments 0
You need to be logged in to leave comments.
Login now