merge.conflictstyle zdiff3 · ca433a0eca - dotfiles - Gitea: Git with a cup of tea

merge.conflictstyle zdiff3

https://ductile.systems/zdiff3/

main

Alpha Chen

parent c420241544

commit ca433a0eca

Signed by:

alpha

SSH Key Fingerprint: SHA256:3fOT8fiYQG/aK9ntivV3Bqtg8AYQ7q4nV6ZgihOA20g

1 changed files with 1 additions and 1 deletions

										
											2

.gitconfig

										Unescape
										Escape
									
											View File
										
					@ -44,7 +44,7 @@

					[apply]

					[apply]

						whitespace = warn

						whitespace = warn

					[merge]

					[merge]

						conflictstyle = diff3

						conflictstyle = zdiff3

						ff = false

						ff = false

						tool = vimdiff

						tool = vimdiff

					[mergetool "vimdiff"]

					[mergetool "vimdiff"]