npm merges

aredridel · May 2, 2018 · 25ef719 · 25ef719
1 parent 7cb56ad
commit 25ef719
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/gitconfig b/gitconfig
@@ -75,3 +75,6 @@
 	required = true
 [diff-so-fancy]
 	changeHunkIndicators = true
+[merge "npm-merge-driver"]
+	name = automatically merge npm lockfiles
+	driver = npx npm-merge-driver merge %A %O %B %P