conflict resolve

1 files changed, 1 insertions, 1 deletions

diff --git a/src/doc.c b/src/doc.c
index 7234fb38bf9..1ddaa117bba 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -826,7 +826,7 @@ Otherwise, return a new string, without any text properties.  */)
           if (NILP (tem))       /* but not on any keys */
             {
               ptrdiff_t offset = bufp - buf;
-              if (STRING_BYTES_BOUND - 4 < bsize)
+              if (bsize > STRING_BYTES_BOUND - 4)
                 string_overflow ();
               buf = xrealloc (buf, bsize += 4);
               bufp = buf + offset;