Mercurial > public > mercurial-scm > hg
comparison mercurial/ui.py @ 35307:4caafe280488
ui: add diff.showfunc to tweakdefaults
This is a little risky, as I think we can have some encoding weirdness
crop up. showfunc also isn't the most robust feature, but it's still
often useful context...
Differential Revision: https://phab.mercurial-scm.org/D1610
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 06 Dec 2017 16:43:07 -0500 |
| parents | 03a83ace9816 |
| children | 4e377c43e80b |
comparison
equal
deleted
inserted
replaced
| 35306:03a83ace9816 | 35307:4caafe280488 |
|---|---|
| 60 # Refuse to perform an `hg update` that would cause a file content merge | 60 # Refuse to perform an `hg update` that would cause a file content merge |
| 61 update.check = noconflict | 61 update.check = noconflict |
| 62 | 62 |
| 63 [diff] | 63 [diff] |
| 64 git = 1 | 64 git = 1 |
| 65 showfunc = 1 | |
| 65 """ | 66 """ |
| 66 | 67 |
| 67 samplehgrcs = { | 68 samplehgrcs = { |
| 68 'user': | 69 'user': |
| 69 b"""# example user config (see 'hg help config' for more info) | 70 b"""# example user config (see 'hg help config' for more info) |