From 1645efa2ced3390f64843bfc90c211f43aaa81b8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 10 Feb 2014 14:16:19 -0800
Subject: [PATCH] Clear conflict when the buffer is saved

---
 spec/text-buffer-spec.coffee | 17 +++++++++++++++++
 src/text-buffer.coffee       |  1 +
 2 files changed, 18 insertions(+)

diff --git a/spec/text-buffer-spec.coffee b/spec/text-buffer-spec.coffee
index 7f26c663b..70e1a773f 100644
--- a/spec/text-buffer-spec.coffee
+++ b/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)
diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee
index 044f89946..f34f657ae 100644
--- a/src/text-buffer.coffee
+++ b/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