[feat] update config

.gitconfig

@@ -2,16 +2,21 @@
 [user]
 # Please adapt and uncomment the following lines:
   name = Jay
-	email = jay@rtj.tw
+  email = jay@lawsnote.com
+[merge]
+  tool = vimdiff
 [diff]
-	tool = vimdiff
+  tool = vimdiff
+  trustExitCode = true
 [difftool]
-	prompt = false
+  prompt = false
 [alias]
-	d = difftool
-	co = checkout
-	ci = commit
-	l = log --oneline --graph --all
-	ls = log --graph --pretty=format:\"%h <%an> %ar %s\" --all
-	st = status
-	br = branch
+  d = difftool
+  co = checkout
+  ci = commit
+  l = log --oneline --graph --all
+  ls = log --graph --pretty=format:\"%h <%an> %ar %s\" --all
+  st = status
+  br = branch
+[mergetool]
+	keepBackup = false