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


describe 'GitBridge', ->

  repoBase = -> atom.project.getRepositories()[0].getWorkingDirectory()

  beforeEach ->
    done = false

      exit(0)

    called = false
    GitBridge.add repo, 'lib/file1.txt', (err) ->
      throw err if err
      called = true

    expect(called).toBe(true)
    expect(c).toBe('/usr/bin/git')
    expect(a).toEqual(['add', 'lib/file1.txt'])
    expect(o).toEqual({ cwd: gitWorkDir })

  describe 'rebase detection', ->

