"Awesome" falls short in describing what @git is like.
Yesterday learned about git log -L, today about merge.conflictstyle diff3.
git log -L
merge.conflictstyle diff3
Truly amazing.
#Git #ProGitBook