       { process: { on: (callback) -> } }
 
     conflicts = []
-    GitBridge.withConflicts (err, cs) ->
+    GitBridge.withConflicts repo, (err, cs) ->
       throw err if err
       conflicts = cs
 

    ])
    expect(c).toBe('/usr/bin/git')
    expect(a).toEqual(['status', '--porcelain'])
    expect(o).toEqual({ cwd: repoBase() })

  describe 'isStaged', ->


        { process: { on: (callback) -> } }

      staged = null
      GitBridge.isStaged repo, checkPath, (err, b) ->
        throw err if err
        staged = b
      staged
