completion: add git config am.threeWay completion
Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
		 Rikard Falkeborn
					Rikard Falkeborn
				
			
				
					committed by
					
						 Junio C Hamano
						Junio C Hamano
					
				
			
			
				
	
			
			
			 Junio C Hamano
						Junio C Hamano
					
				
			
						parent
						
							f254eab2e0
						
					
				
				
					commit
					e8dec56770
				
			| @ -2343,6 +2343,7 @@ _git_config () | |||||||
| 		advice.statusHints | 		advice.statusHints | ||||||
| 		alias. | 		alias. | ||||||
| 		am.keepcr | 		am.keepcr | ||||||
|  | 		am.threeWay | ||||||
| 		apply.ignorewhitespace | 		apply.ignorewhitespace | ||||||
| 		apply.whitespace | 		apply.whitespace | ||||||
| 		branch.autosetupmerge | 		branch.autosetupmerge | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user