equal
deleted
inserted
replaced
66 grep.all-files = True |
66 grep.all-files = True |
67 # Refuse to perform an `hg update` that would cause a file content merge |
67 # Refuse to perform an `hg update` that would cause a file content merge |
68 update.check = noconflict |
68 update.check = noconflict |
69 # Show conflicts information in `hg status` |
69 # Show conflicts information in `hg status` |
70 status.verbose = True |
70 status.verbose = True |
|
71 # Make `hg resolve` with no action (like `-m`) fail instead of re-merging. |
|
72 resolve.explicit-re-merge = True |
71 |
73 |
72 [diff] |
74 [diff] |
73 git = 1 |
75 git = 1 |
74 showfunc = 1 |
76 showfunc = 1 |
75 word-diff = 1 |
77 word-diff = 1 |