| changeset 46794 | e2f7b2695ba1 |
| parent 46765 | 62c2857a174b |
| parent 46687 | 83ffc49f7e48 |
| child 46819 | d4ba4d51f85f |
| 46782:6b52cffd8d0a | 46794:e2f7b2695ba1 |
|---|---|
867 for path in self.unresolvedpaths |
867 for path in self.unresolvedpaths |
868 ] |
868 ] |
869 ) |
869 ) |
870 msg = ( |
870 msg = ( |
871 _( |
871 _( |
872 '''Unresolved merge conflicts: |
872 b'''Unresolved merge conflicts: |
873 |
873 |
874 %s |
874 %s |
875 |
875 |
876 To mark files as resolved: hg resolve --mark FILE''' |
876 To mark files as resolved: hg resolve --mark FILE''' |
877 ) |
877 ) |