[rcxdude]

Yeah, a GUI really helps with version control. And all of them have a honking great 'abort' button for merges and rebases.