Mercurial > index.cgi > dotfiles

comparison .hgrc @ 187:1e15f715858e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A slightly nicer vimdiff
author Steve Huston <huston@astro.princeton.edu>
date Thu, 05 Mar 2020 18:01:08 -0500
parents 21e0ab41e180
children 282804a3a32b
comparison
equal deleted inserted replaced
186:83f164405755 187:1e15f715858e
11 color = 11 color =
12 record = 12 record =
13 13
14 [merge-tools] 14 [merge-tools]
15 vimdiff.executable = vim 15 vimdiff.executable = vim
16 vimdiff.args = -d $output $base $local $other -c "wincmd J" 16 vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
17 vimdiff.premerge = keep
17 18
18 [trusted] 19 [trusted]
19 groups = help 20 groups = help
20 21
21 # Includes - here we pull in a config file for the particular host on which 22 # Includes - here we pull in a config file for the particular host on which