git: add merge driver for npm lockfiles
1 file changed, 3 insertions(+), 0 deletions(-)
jump to
M git/.config/git/config → git/.config/git/config
@@ -48,3 +48,6 @@ cmd = icdiff --line-numbers $LOCAL $REMOTE [gpg] program = gpg +[merge "npm-merge-driver"] + name = automatically merge npm lockfiles + driver = npx npm-merge-driver merge %A %O %B %P