]> oss.titaniummirror.com Git - smckown/dotfiles.git/commitdiff
projects / smckown / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: fb02663)
.gitconfig: use merge conflictstyle diff3
authorR. Steve McKown <rsmckown@gmail.com>
Fri, 11 Mar 2016 22:31:59 +0000 (15:31 -0700)
committerR. Steve McKown <rsmckown@gmail.com>
Wed, 16 Mar 2016 22:26:16 +0000 (16:26 -0600)
This conflictstyle seems to be easier for me when doing three-way merges
in some very complex cases where vimdiff or kdiff with 4 panes open
doesn't help enough.


No differences found
Steve's dotfiles, including vim config