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

git: gitconfig: Remove diff3 as conflict style

Browse source 
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>
This commit is contained in:
Sanchayan Maity 2020-05-05 11:25:50 +05:30
parent 7f51f5d2d4
commit f8ce9ccb21
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
git/.gitconfig
View file

@ -14,7 +14,6 @@
sslVerify = false sslVerify = false
[merge] [merge]
tool = diffconflicts tool = diffconflicts
conflictstyle=diff3
[mergetool "diffconflicts"] [mergetool "diffconflicts"]
cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE" cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true trustExitCode = true