A work-in-progress tool to make merging in git easy as pie.