Git merge conflict search shortcut