iterm: Add useful trigger to highlight git merge conflicts
iterm: Add useful trigger to highlight git merge conflicts

jocelynjeffrey/mydotfiles,nicksp/dotfiles,nicksp/dotfiles,jocelynjeffrey/mydotfiles,nicksp/dotfiles,nicksp/dotfiles,jocelynjeffrey/mydotfiles