Suppose I\'m in the middle of a rebase (interactive, or otherwise), and a merge-conflict is detected.
The merge stops, and I run (on the cmd line) git mergetool
git mergetool