 
   @headingClass = 'warning'
 
-  @bodyMarkup: ->
+  @bodyMarkup: (state) ->
     @text "Careful, you've still got conflict markers left! "
-    if @state.isRebase
+    if state.isRebase
       @code 'git rebase --abort'
     else
       @code 'git merge --abort'


  @headingClass = 'info'

  @bodyMarkup: ->
    @text 'No conflicts here!'

class MaybeLaterView extends MessageView


  @headingClass = 'success'

  @bodyMarkup: (state) ->
    @text "That's everything. "
    if state.isRebase
      @code 'git rebase --continue'
      @text ' at will to resume rebasing.'
    else
