MetroGit
MetroGit copied to clipboard
Conflict Merge
In conflict state, update the commit panel to show merge or abort button and hook up abort functionality