equal
deleted
inserted
replaced
64 status.relative = yes |
64 status.relative = yes |
65 # Refuse to perform an `hg update` that would cause a file content merge |
65 # Refuse to perform an `hg update` that would cause a file content merge |
66 update.check = noconflict |
66 update.check = noconflict |
67 # Show conflicts information in `hg status` |
67 # Show conflicts information in `hg status` |
68 status.verbose = True |
68 status.verbose = True |
69 # Skip the bisect state in conflicts information in `hg status` |
|
70 status.skipstates = bisect |
|
71 |
69 |
72 [diff] |
70 [diff] |
73 git = 1 |
71 git = 1 |
74 showfunc = 1 |
72 showfunc = 1 |
75 """ |
73 """ |