changeset 21918 | 10abc3a5c6b2 |
parent 21916 | 792ebd7dc5f6 |
child 21919 | c350cff58444 |
--- a/tests/run-tests.py Thu Jul 17 20:17:17 2014 -0400 +++ b/tests/run-tests.py Sun Jul 06 02:56:41 2014 +0900 @@ -648,6 +648,7 @@ hgrc.write('[ui]\n') hgrc.write('slash = True\n') hgrc.write('interactive = False\n') + hgrc.write('mergemarkers = detailed\n') hgrc.write('[defaults]\n') hgrc.write('backout = -d "0 0"\n') hgrc.write('commit = -d "0 0"\n')