##// END OF EJS Templates
morestatus: convert a UI message about merge conflicts to bytes...
Matt Harbison -
r47514:83ffc49f stable
parent child Browse files
Show More
@@ -869,7 +869,7 b' class morestatus(object):'
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
General Comments 0
You need to be logged in to leave comments. Login now