         editor = editorView.getModel()
         state =
           isRebase: false
-          repo:
-            getWorkingDirectory: -> ""
-            relativize: (filepath) -> filepath
+          relativize: (filepath) -> filepath
+          context:
+            isStaged: (filepath) -> Promise.resolve false
 
         m = new ConflictedEditor(state, pkg, editor)
         m.mark()

        editor = editorView.getModel()
        state =
          isRebase: true
          repo:
            getWorkingDirectory: -> ""
            relativize: (filepath) -> filepath

        m = new ConflictedEditor(state, pkg, editor)
        m.mark()

  beforeEach ->
    pkg = util.pkgEmitter()

  afterEach ->
    pkg.dispose()

