(name string)
| 151 | } |
| 152 | |
| 153 | func (self *Shell) Merge(name string) *Shell { |
| 154 | return self.RunCommand([]string{"git", "merge", "--commit", "--no-ff", name}) |
| 155 | } |
| 156 | |
| 157 | func (self *Shell) ContinueMerge() *Shell { |
| 158 | return self.RunCommand([]string{"git", "-c", "core.editor=true", "merge", "--continue"}) |
no test coverage detected