# This is Git's per-user configuration file. [user] name = acicchetti email = acicchetti@constantcontact.com [diff] tool = vimdiff [merge] tool = vimdiff conflictstyle = diff3 [mergetool "vimdiff"] cmd = nvim -d $BASE $LOCAL $REMOTE