Sanchayan Maity
f8ce9ccb21
diff3 as conflict style was required by vim-mergetool. It is not required by the current plugins we are using. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
21 lines
426 B
INI
21 lines
426 B
INI
[user]
|
|
name = Sanchayan Maity
|
|
email = maitysanchayan@gmail.com
|
|
login = sanchayanmaity
|
|
[core]
|
|
editor = "nvim"
|
|
pager = delta --dark
|
|
excludesfile = ~/.config/git/ignore
|
|
[color]
|
|
ui = auto
|
|
[sendemail]
|
|
smtpserver = /usr/bin/msmtp
|
|
[http]
|
|
sslVerify = false
|
|
[merge]
|
|
tool = diffconflicts
|
|
[mergetool "diffconflicts"]
|
|
cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
|
|
trustExitCode = true
|
|
keepBackup = false
|