Clear conflict when the buffer is saved

spec/text-buffer-spec.coffee

@@ -571,6 +571,23 @@ describe 'TextBuffer', ->
         saveBuffer.reload()
         expect(events).toEqual ['will-reload', 'reloaded']
 
+      it "no longer reports being in conflict", ->
+        saveBuffer.setText('a')
+        saveBuffer.save()
+        saveBuffer.setText('ab')
+
+        fs.writeFileSync(saveBuffer.getPath(), 'c')
+        conflictHandler = jasmine.createSpy('conflictHandler')
+        saveBuffer.on 'contents-conflicted', conflictHandler
+
+        waitsFor ->
+          conflictHandler.callCount > 0
+
+        runs ->
+          expect(saveBuffer.isInConflict()).toBe true
+          saveBuffer.save()
+          expect(saveBuffer.isInConflict()).toBe false
+
     describe "when the buffer has no path", ->
       it "throws an exception", ->
         saveBuffer = atom.project.bufferForPathSync(null)

src/text-buffer.coffee

@@ -196,6 +196,7 @@ class TextBuffer extends TextBufferCore
     @setPath(path)
     @cachedDiskContents = @getText()
     @file.write(@getText())
+    @conflict = false
     @emitModifiedStatusChanged(false)
     @emit 'saved', this