Skip to content

Commit 127621f

Browse files
committed
🔥 Tidy up code
as title
1 parent 0c0fccf commit 127621f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.gitconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
# [merge "npm-merge-driver"]
9191
# name = automatically merge npm lockfiles
9292
# driver = npx npm-merge-driver merge %A %O %B %P
93-
[mergetool]
93+
tool = smerge
94+
[mergetool "smerge"]
9495
# Clean up backup files created by merge tools on tool exit
9596
keepBackup = false
9697
# Clean up temp files created by merge tools on tool exit

0 commit comments

Comments
 (0)