Push current

This commit is contained in:
Daniel Flanagan 2019-01-30 14:24:05 -06:00
parent ff19ca66e8
commit a03f7df81a

View file

@ -29,4 +29,7 @@
prompt = false prompt = false
[mergetool "nvimdiff"] [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