From d9ddf516f8750fb7979356de81ca7019529e771d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 10 Feb 2014 14:21:55 -0800
Subject: [PATCH] :memo: Clarify TextBuffer::isInConflict

---
 src/text-buffer.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee
index 552e44137..2adc613c0 100644
--- a/src/text-buffer.coffee
+++ b/src/text-buffer.coffee
@@ -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