Форматирование
This commit is contained in:
		@@ -1,22 +1,22 @@
 | 
			
		||||
[user]
 | 
			
		||||
	name         = John Doe
 | 
			
		||||
	email        = john@doe.com
 | 
			
		||||
	name            = John Doe
 | 
			
		||||
	email           = john@doe.com
 | 
			
		||||
 | 
			
		||||
[core]
 | 
			
		||||
	editor       = mcedit
 | 
			
		||||
	pager        = delta
 | 
			
		||||
	editor          = mcedit
 | 
			
		||||
	pager           = delta
 | 
			
		||||
 | 
			
		||||
[interactive]
 | 
			
		||||
	diffFilter   = delta --color-only
 | 
			
		||||
	diffFilter      = delta --color-only
 | 
			
		||||
 | 
			
		||||
[delta]
 | 
			
		||||
	navigate     = true    # use n and N to move between diff sections
 | 
			
		||||
	light        = false      # set to true if you're in a terminal w/ a light background color
 | 
			
		||||
	side-by-side = true
 | 
			
		||||
	navigate        = true   # use n and N to move between diff sections
 | 
			
		||||
	light           = false  # set to true if you're in a terminal w/ a light background color
 | 
			
		||||
	side-by-side    = true
 | 
			
		||||
 | 
			
		||||
[merge]
 | 
			
		||||
	tool          = delta
 | 
			
		||||
	conflictstyle = diff3
 | 
			
		||||
	tool            = delta
 | 
			
		||||
	conflictstyle   = diff3
 | 
			
		||||
 | 
			
		||||
[diff]
 | 
			
		||||
	colorMoved    = default
 | 
			
		||||
	colorMoved      = default
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user