christian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mercurial merging

Browse Source
This commit is contained in:
Christian Nieves
2023-08-08 10:08:41 -05:00
parent b1d1bb9e32
commit 516f2bc424
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
google/.hgrc
View File

@ -9,12 +9,11 @@ username = Christian Nieves <cnieves@google.com>
[extdiff] [extdiff]
icdiff = icdiff --recursive --line-numbers icdiff = icdiff --recursive --line-numbers
cmd.meld = /usr/bin/meld
cmd.pmeld = /usr/bin/meld
cmd.vimdiff = nvim cmd.vimdiff = nvim
_real_multidiff = hg-multi-diff opts.vimdiff = -d
# opts.vimdiff = -d $base $local $output $other +close +close # opts.vimdiff = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
# opts.vimdiff = -f '+next' '+execute "DirDiff" fnameescape(argv(0)) fnameescape(argv(1))' # opts.vimdiff = -f '+next' '+execute "DirDiff" fnameescape(argv(0)) fnameescape(argv(1))'
# opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))'
[extensions] [extensions]
unsupported.tree = unsupported.tree =
@ -28,11 +27,10 @@ findings.extra_args = --proxy
summarize.extra_args = --proxy summarize.extra_args = --proxy
[merge-tools] [merge-tools]
# meld.args = --auto-merge --label='incoming' $local --label='merged' $base --label='existing' $other -o $output
# https://www.mercurial-scm.org/wiki/MergingWithVim#More_Useful_3-Way_Diff
vimdiff.executable = nvim vimdiff.executable = nvim
vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write" # vimdiff.args = -d $local $other $base
vimdiff.premerge = keep # vimdiff.premerge = keep
vimdiff.args = -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
[diff-tools] [diff-tools]
vimdiff.executable = nvim vimdiff.executable = nvim