Mercurial > dotfiles
comparison .hgrc @ 386:40c0bc5ff266
hg: really end vimdiff's reign of terror
In fe18716866 I left off the trailing 'd' on 'disabled', because I
forgot how my own change to core Mercurial worked.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Mon, 14 Mar 2016 22:03:27 -0400 |
| parents | 20e47bc8eea9 |
| children | cf3b1ba01e69 |
comparison
equal
deleted
inserted
replaced
| 385:98480bc457ab | 386:40c0bc5ff266 |
|---|---|
| 32 ignore = ~/.hgglobalignore | 32 ignore = ~/.hgglobalignore |
| 33 usehttp2=true | 33 usehttp2=true |
| 34 mergemarkers = detailed | 34 mergemarkers = detailed |
| 35 | 35 |
| 36 [merge-tools] | 36 [merge-tools] |
| 37 vimdiff.disable = yes | 37 vimdiff.disabled = yes |
| 38 gvimdiff.disable = yes | 38 gvimdiff.disabled = yes |
| 39 | 39 |
| 40 [defaults] | 40 [defaults] |
| 41 annotate = -nu | 41 annotate = -nu |
| 42 serve = -v | 42 serve = -v |
| 43 | 43 |