diff --git a/home/.config/git/config b/home/.config/git/config index ff052d53..dc51040f 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -24,7 +24,7 @@ tool = nvim-merge [mergetool "nvim-merge"] - cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' keepBackup = false [diff]