Skip to content

Instantly share code, notes, and snippets.

@AlabasterAxe
Created February 23, 2019 07:51
Show Gist options
  • Save AlabasterAxe/cd9ab624fdd4e999fcce7e8b2178940d to your computer and use it in GitHub Desktop.
Save AlabasterAxe/cd9ab624fdd4e999fcce7e8b2178940d to your computer and use it in GitHub Desktop.
Mercurial Config
[ui]
username = mattkeller
merge = vimdiff
[extensions]
extdiff=
hgk=
hgext.beautifygraph=
histedit=
[merge-tools]
vimdiff.executable = vimdiff
vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
vimdiff.premerge = keep
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment