Show More
@@ -60,6 +60,10 b' interface = curses' | |||||
60 | status.relative = yes |
|
60 | status.relative = yes | |
61 | # Refuse to perform an `hg update` that would cause a file content merge |
|
61 | # Refuse to perform an `hg update` that would cause a file content merge | |
62 | update.check = noconflict |
|
62 | update.check = noconflict | |
|
63 | # Show conflicts information in `hg status` | |||
|
64 | status.verbose = True | |||
|
65 | # Skip the bisect state in conflicts information in `hg status` | |||
|
66 | status.skipstates = bisect | |||
63 |
|
67 | |||
64 | [diff] |
|
68 | [diff] | |
65 | git = 1 |
|
69 | git = 1 |
General Comments 0
You need to be logged in to leave comments.
Login now