diff options
| author | Maciej Sobkowski <maciejjo@maciejjo.pl> | 2016-06-16 15:14:53 +0200 |
|---|---|---|
| committer | Maciej Sobkowski <maciejjo@maciejjo.pl> | 2016-06-16 15:27:18 +0200 |
| commit | a7b47fc93a74d3c1f6d8950bda9d0c7d1b46a31f (patch) | |
| tree | f6ad35800e52d2ce8e21e755b660c2f38e56dba6 /git/.gitconfig | |
| parent | 02787723a913416ec224f06913b2195697c32562 (diff) | |
git: Set vimdiff as mergetool
Diffstat (limited to 'git/.gitconfig')
| -rw-r--r-- | git/.gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index bed7de3..b287a00 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -10,3 +10,5 @@ l = log --pretty=format:'%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen%cr%Creset %Cblue%an%Creset' --abbrev-commit --date=relative [color] ui = auto +[merge] + tool = vimdiff |