| changeset 34707 | 6cd8d8203204 |
| parent 34645 | 75979c8d4572 |
| child 34849 | 9f2891fb426c |
| 34706:8782076874f5 | 34707:6cd8d8203204 |
|---|---|
51 rollback = False |
51 rollback = False |
52 |
52 |
53 [commands] |
53 [commands] |
54 # Make `hg status` emit cwd-relative paths by default. |
54 # Make `hg status` emit cwd-relative paths by default. |
55 status.relative = yes |
55 status.relative = yes |
56 # Refuse to perform an `hg update` that would cause a file content merge |
|
57 update.check = noconflict |
|
56 |
58 |
57 [diff] |
59 [diff] |
58 git = 1 |
60 git = 1 |
59 """ |
61 """ |
60 |
62 |