📝 Clarify TextBuffer::isInConflict

This commit is contained in:
Kevin Sawicki
2014-02-10 14:21:55 -08:00
parent 1436b8eb5e
commit d9ddf516f8

View File

@@ -213,7 +213,10 @@ class TextBuffer extends TextBufferCore
else
not @isEmpty()
# Identifies if a buffer is in a git conflict with `HEAD`.
# Is the buffer's text in conflict with the text on disk?
#
# This occurs when the buffer's file changes on disk while the buffer has
# unsaved changes.
#
# Returns a {Boolean}.
isInConflict: -> @conflict