git: Add an edit-conflicts alias.

The edit-conflicts alias will start emacs on all files that are in the
conflict state.  Quick way to start fixing the conflicts.