diff options
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,6 +22,7 @@ ours = "!f() { git checkout --ours $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" p = push --follow-tags + dw = diff --color-words [merge] tool = vimdiff conflictstyle = diff3 |