diff options
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 |