]> oss.titaniummirror.com Git - smckown/dotfiles.git/commit
projects / smckown / dotfiles.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 61ecab6) | patch
.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)
commitfb02663f5f05e22ad7123b1e6b5431302a97ef20
treefdf3ecb2055c86c8fb77945f09187de96cbc4e0etree | snapshot
parent61ecab661a886a047c0a01c07c7089c22428ca9ccommit | diff
.gitconfig: use merge conflictstyle diff3

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.
gitconfig diff | blob | history
Steve's dotfiles, including vim config