From c2ea91bca09af73d82dc090887cb9d3aa8739ef0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 13:39:43 +0200 Subject: [PATCH] Git: change order of windows in neovim mergetool --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index ff052d5..dc51040 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]