diffconflictsA better Vimdiff Git mergetoolVim Script★ 424gitmergetoolvimvim-pluginvimdiffw@whiteinge++
dotfilesdotfiles for vim, git, zsh, tmux, cwm, xinit, and many others.Shell★ 329dotfileslinuxtmuxvimw@whiteinge++