fix git hunk conficts
This commit is contained in:
		
							parent
							
								
									d81595ea94
								
							
						
					
					
						commit
						4f160cfe77
					
				
							
								
								
									
										3
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										3
									
								
								init.lua
								
								
								
								
							| 
						 | 
				
			
			@ -85,9 +85,6 @@ require('lazy').setup({
 | 
			
		|||
        changedelete = { text = '~' },
 | 
			
		||||
      },
 | 
			
		||||
      on_attach = function(bufnr)
 | 
			
		||||
        vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk,
 | 
			
		||||
          { buffer = bufnr, desc = '[G]o to [P]revious 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>hp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = 'Preview git hunk' })
 | 
			
		||||
 | 
			
		||||
        -- don't override the built-in and fugitive keymaps
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue