jiangyinzuo

function Z(query, sink)
	let l:cmd = "awk -f " . $VIMRC_ROOT . "/z.awk regex=" . a:query . " ~/.z "
	call fzf#run(fzf#wrap({'source': l:cmd, 'sink': a:sink, 'options': ['--query', a:query, '--prompt', 'Z ' . a:sink . '>', '--color', 'hl:148,hl+:190']}))
endfunction

command! -bang -nargs=? Z call Z(<q-args>, 'cd')
command! -bang -nargs=? TZ call Z(<q-args>, 'tcd')
command! -bang -nargs=? LZ call Z(<q-args>, 'lcd')
command! -bang -nargs=? Zex call Z(<q-args>, 'Ex')

jiangyinzuo

Table Of Content

Skip to the relevant sections if needed.

• 2-min tutorial to do it the quick-and-dirty-way
• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
  • Resolving conflict from a Git pull
• Other great references and tutorials