lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Push current

Browse source
This commit is contained in:
Daniel Flanagan 2019-01-30 14:24:05 -06:00
parent ff19ca66e8
commit a03f7df81a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/git/config
View file

@ -29,4 +29,7 @@
prompt = false
[mergetool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[push]
default = current