Adds globwhich.
Adds git-find-merge.
Git uses 3-way diff for merge conflicts.