tests/run-tests.py
changeset 21918 10abc3a5c6b2
parent 21916 792ebd7dc5f6
child 21919 c350cff58444
equal deleted inserted replaced
21917:ac3b3a2d976d 21918:10abc3a5c6b2
   646         """Create an hgrc file for this test."""
   646         """Create an hgrc file for this test."""
   647         hgrc = open(path, 'wb')
   647         hgrc = open(path, 'wb')
   648         hgrc.write('[ui]\n')
   648         hgrc.write('[ui]\n')
   649         hgrc.write('slash = True\n')
   649         hgrc.write('slash = True\n')
   650         hgrc.write('interactive = False\n')
   650         hgrc.write('interactive = False\n')
       
   651         hgrc.write('mergemarkers = detailed\n')
   651         hgrc.write('[defaults]\n')
   652         hgrc.write('[defaults]\n')
   652         hgrc.write('backout = -d "0 0"\n')
   653         hgrc.write('backout = -d "0 0"\n')
   653         hgrc.write('commit = -d "0 0"\n')
   654         hgrc.write('commit = -d "0 0"\n')
   654         hgrc.write('shelve = --date "0 0"\n')
   655         hgrc.write('shelve = --date "0 0"\n')
   655         hgrc.write('tag = -d "0 0"\n')
   656         hgrc.write('tag = -d "0 0"\n')