Skip to content

Instantly share code, notes, and snippets.

@dteoh

dteoh/.gitconfig

Created March 17, 2019 23:40
Download ZIP

Revisions

  1. dteoh created this gist Mar 17, 2019.
    8 changes: 8 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,8 @@
    [merge]
    tool = vimdiff

    [mergetool]
    keepBackup = false

    [mergetool "vimdiff"]
    cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'