Merge pull request #323 from luizcalliari/master
FIX: Conflict with vimdiff keybinding
This commit is contained in:
		
						commit
						e15e7f4bda
					
				
							
								
								
									
										4
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										4
									
								
								init.lua
								
								
								
								
							|  | @ -122,8 +122,8 @@ require('lazy').setup({ | ||||||
|         changedelete = { text = '~' }, |         changedelete = { text = '~' }, | ||||||
|       }, |       }, | ||||||
|       on_attach = function(bufnr) |       on_attach = function(bufnr) | ||||||
|         vim.keymap.set('n', '[c', require('gitsigns').prev_hunk, { buffer = bufnr, desc = 'Go to Previous Hunk' }) |         vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) | ||||||
|         vim.keymap.set('n', ']c', require('gitsigns').next_hunk, { buffer = bufnr, desc = 'Go to Next Hunk' }) |         vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' }) | ||||||
|         vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) |         vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) | ||||||
|       end, |       end, | ||||||
|     }, |     }, | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Chris Patti
						Chris Patti