diff options
Diffstat (limited to 'git')
| -rw-r--r-- | git/.config/git/config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index bdf88f5..464018b 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -48,3 +48,6 @@ [gpg] program = gpg +[merge "npm-merge-driver"] + name = automatically merge npm lockfiles + driver = npx npm-merge-driver merge %A %O %B %P |