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

  beforeEach ->
    pkg = util.pkgEmitter()

    done = false

    GitBridge.locateGitAnd (err) ->
      throw err if err?
      done = true

    waitsFor -> done

  afterEach ->
    pkg.dispose()


        editor = editorView.getModel()
        state =
          isRebase: false
          relativize: (filepath) -> filepath
          context:
            isStaged: (filepath) -> Promise.resolve false

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