 
     beforeEach ->
       util.openPath 'triple-2way-diff.txt', (editorView) ->
-        conflicts = Conflict.all({}, editorView.getEditor())
+        conflicts = Conflict.all({}, editorView.getModel())
         navigator = conflicts[1].navigator
 
     it 'knows its conflict', ->


    beforeEach ->
      util.openPath 'single-2way-diff.txt', (editorView) ->
        editor = editorView.getEditor()
        [conflict] = Conflict.all {}, editor

    it 'retains a reference to conflict', ->


  it "finds multiple conflict markings", ->
    util.openPath 'multi-2way-diff.txt', (editorView) ->
      cs = Conflict.all({}, editorView.getModel())

      expect(cs.length).toBe(2)
      expect(util.rowRangeFrom cs[0].ours.marker).toEqual([5, 7])
