mirror of
				https://github.com/kastdeur/dotfiles.git
				synced 2025-10-31 03:06:35 +01:00 
			
		
		
		
	New GitMergeTool + IdentityKeys for ssh
This commit is contained in:
		
							parent
							
								
									fec8135663
								
							
						
					
					
						commit
						45a61379dc
					
				
					 1 changed files with 2 additions and 0 deletions
				
			
		|  | @ -12,3 +12,5 @@ | |||
| 	excludesfile = ~/.gitignore_global | ||||
| [color] | ||||
| 	ui = auto | ||||
| [merge] | ||||
| 	conflictstyle = diff3 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue