diff options
Diffstat (limited to 'git')
| -rwxr-xr-x | git/.gitconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 5f218e0..e7a8b2c 100755 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -36,3 +36,8 @@ upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')} [rerere] enabled = true +[merge] + tool = vimdiff + conflictstyle = diff3 +[mergetool] + prompt = false |