Keep old git merge behaviour
I find it way to much / complicated and am used to my old way to merge things which I keep for now.
This commit is contained in:
parent
49ff32a4e6
commit
40de1d353f
|
@ -107,16 +107,11 @@
|
||||||
|
|
||||||
merge = {
|
merge = {
|
||||||
ff = true;
|
ff = true;
|
||||||
tool = "new";
|
tool = "nvimdiff4";
|
||||||
conflictStyle = "diff3";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"mergetool \"nvimdiff4\"" = {
|
"mergetool \"nvimdiff4\"" = {
|
||||||
cmd = "${pkgs.neovim}/bin/nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
|
cmd = "${pkgs.neovim}/bin/nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
|
||||||
};
|
};
|
||||||
"mergetool \"new\"" = {
|
|
||||||
cmd = "${pkgs.neovim}/bin/nvim -f $MERGED $BASE $LOCAL $REMOTE -c 'MergetoolStart'";
|
|
||||||
trustExitCode = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -260,12 +260,6 @@ in {
|
||||||
}
|
}
|
||||||
|
|
||||||
fugitive
|
fugitive
|
||||||
{
|
|
||||||
plugin = vim-mergetool;
|
|
||||||
config = ''
|
|
||||||
let g:mergetool_layout = 'b,lr,m'
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
||||||
vim-commentary
|
vim-commentary
|
||||||
vim-indent-object
|
vim-indent-object
|
||||||
|
|
Loading…
Reference in a new issue