]> git.rmz.io Git - dotfiles.git/commit
repos / dotfiles.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aec02e2) | patch
git: use diff3 for conflictstyle
authorSamir Benmendil <me@rmz.io>
Sat, 1 May 2021 13:49:48 +0000 (14:49 +0100)
committerSamir Benmendil <me@rmz.io>
Sat, 1 May 2021 13:49:48 +0000 (14:49 +0100)
commit11a0c9f9676ea9f8f0e8768b3e6cc569786320c4
treedccb431738af5d7daf9cede8361379c6eeb50303tree | snapshot
parentaec02e29c44ae438e42cac926290626061af1894commit | diff
git: use diff3 for conflictstyle

Provides extra info on the conflicted file, instead of showing just the
new and the old, it also provides the base. This should help with
deciding which side to pick or better integrate both sides of the
conflict.
git/config diff | blob | history
My dotfiles