equal
deleted
inserted
replaced
65 status.relative = yes |
65 status.relative = yes |
66 # Refuse to perform an `hg update` that would cause a file content merge |
66 # Refuse to perform an `hg update` that would cause a file content merge |
67 update.check = noconflict |
67 update.check = noconflict |
68 # Show conflicts information in `hg status` |
68 # Show conflicts information in `hg status` |
69 status.verbose = True |
69 status.verbose = True |
|
70 # Refuse to perform `hg resolve --mark` on files that still have conflict |
|
71 # markers |
|
72 resolve.mark-check = abort |
70 |
73 |
71 [diff] |
74 [diff] |
72 git = 1 |
75 git = 1 |
73 showfunc = 1 |
76 showfunc = 1 |
74 word-diff = 1 |
77 word-diff = 1 |