Sanchayan Maity
534eebb89e
Also add the conflict-marker plugin. This should also be useful for doing rebases and resolving conflicts. Might drop one later if one of them serves all the purposes in all cases. While at it, add unimpaired style bindings for moving between tabs. This is required since :DiffConflictsShowHistory opens a new tab and default tab navigation bindings gt/gT at least are binded to something else in python. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
21 lines
447 B
INI
21 lines
447 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
|
|
conflictstyle=diff3
|
|
[mergetool "diffconflicts"]
|
|
cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
|
|
trustExitCode = true
|
|
keepBackup = false
|