Fix merge conflict.
New version of git completion that actually works on broken-ass LISA environment.