Clear conflict when the buffer is saved

2026-04-06 03:02:13 -04:00 · 2014-02-10 14:16:19 -08:00
parent 9b3cdd00c8
commit 1645efa2ce
2 changed files with 18 additions and 0 deletions
--- 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