Last Updated: February 25, 2016
·
595
· trq

Git conflicts into vim arg list

The following will put all conflicting files into vims arg list for easy access.

:args `git conflicts`

1 Response
Add your response

Damn.. got so used to this being there. You'll also need the following git alias:

git config --global alias.conflicts '!git ls-files -u | cut -f 2 | sort -u'
over 1 year ago ·