Resolve alias

Open vim with a tab for each git conflict.