sanchayanmaity
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Fix merge tool command

This commit is contained in:
Sanchayan Maity 2021-04-28 13:29:17 +05:30
parent db6657f3ce
commit 0a220f0e8d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/.gitconfig
View File

@ -25,7 +25,7 @@
prompt = false
keepBackup = false
[mergetool "diffconflicts"]
cmd = 'nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
cmd = nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true
[rebase]
autosquash = true