equal
deleted
inserted
replaced
1437 """Create an hgrc file for this test.""" |
1437 """Create an hgrc file for this test.""" |
1438 with open(path, 'wb') as hgrc: |
1438 with open(path, 'wb') as hgrc: |
1439 hgrc.write(b'[ui]\n') |
1439 hgrc.write(b'[ui]\n') |
1440 hgrc.write(b'slash = True\n') |
1440 hgrc.write(b'slash = True\n') |
1441 hgrc.write(b'interactive = False\n') |
1441 hgrc.write(b'interactive = False\n') |
|
1442 hgrc.write(b'detailed-exit-code = True\n') |
1442 hgrc.write(b'merge = internal:merge\n') |
1443 hgrc.write(b'merge = internal:merge\n') |
1443 hgrc.write(b'mergemarkers = detailed\n') |
1444 hgrc.write(b'mergemarkers = detailed\n') |
1444 hgrc.write(b'promptecho = True\n') |
1445 hgrc.write(b'promptecho = True\n') |
1445 hgrc.write(b'[defaults]\n') |
1446 hgrc.write(b'[defaults]\n') |
1446 hgrc.write(b'[devel]\n') |
1447 hgrc.write(b'[devel]\n') |