git mergetool
Opens up the configured merge tool for resolving conflicts. Additionally, depending on the tool you used, you might need to mark the files as resolved using "git add".
Search Git Commands | More How Tos
