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