git merge.conflictstyle = diff3
update mc-lists.el
dirtrack: only rename buf if still *shell: ~/foo*
use diff --patience in my git diff aliases
add pcmpl-git to Carton; now available in MELPA

https://github.com/milkypostman/melpa/pull/669

It hasn't actually built yet, but it's not like I restart Emacs all that
often, so it'll just be there by the next time I care ...