diff options
| author | Patrick Spek <p.spek@tyil.nl> | 2020-04-17 10:47:31 +0200 |
|---|---|---|
| committer | Patrick Spek <p.spek@tyil.nl> | 2021-08-14 11:59:36 +0200 |
| commit | f29ecbbb913ee5b5dcca53d6e155c5ebf21c6bf9 (patch) | |
| tree | b09a832d89c0c9754568cf88e1194a25dd068a74 /.config | |
| parent | ef8424e69ba569b0cfcecdd28ac1d6d60e30c1ce (diff) | |
Add mergetool to git config
Diffstat (limited to '.config')
| -rw-r--r-- | .config/git/config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index 0f811e4..156593a 100644 --- a/.config/git/config +++ b/.config/git/config @@ -35,6 +35,9 @@ [difftool] prompt = false +[merge] + tool = vimdiff + [pull] default = current #rebase = true |