Post by David Blume
@b0rk vimdiff with conflictstyle = diff3 works well for me. From .gitconfig: [merge] tool = vimdiff conflictstyle = diff3
By David Blume
@b0rk vimdiff with conflictstyle = diff3 works well for me. From .gitconfig: [merge] tool = vimdiff conflictstyle = diff3
By David Blume