Change git diff conflict style · 9bf942e661 - dotfiles - Kahtlane Git

Arti Zirk 2 years ago

parent

e2fca2183e

commit

9bf942e661

1 changed files with 1 additions and 0 deletions

Unified View

								
									1

.gitconfig

								Unescape
								Escape
							
									View File
								
					@ -3,6 +3,7 @@
				
						email = arti.zirk@gmail.com
					
						email = arti.zirk@gmail.com
				
					[merge]
					
					[merge]
				
						tool = meld
					
						tool = meld
				
						conflictstyle = diff3
				
					[alias]
					
					[alias]
				
						plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches
					
						plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches