diff options
| author | Ben Harris <ben@tilde.team> | 2019-08-13 17:06:27 -0400 |
|---|---|---|
| committer | Ben Harris <ben@tilde.team> | 2019-08-13 17:06:27 -0400 |
| commit | 22ee872d525144f66540bc78e2d6032b570f87ed (patch) | |
| tree | 45438810d759f0ee2c697679cdda9bd5e9c352f7 /git | |
| parent | d38bddff8a01dc59aa828fb461f6a4e5f196d8f6 (diff) | |
some vim tips from begriffs' vim history post
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 |