merge-recursive: flush output buffer before printing error messages

diff --git a/refs.h b/refs.h
index 442c1a5db8147262bf2894f3bc47b67683f838b6..1b020437586d4480377080c95adb446f28d03a46 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -360,7 +360,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
  *     msg -- a message describing the change (for the reflog).
  *
  *     err -- a strbuf for receiving a description of any error that
- *         might have occured.
+ *         might have occurred.
  *
  * The functions make internal copies of refname and msg, so the
  * caller retains ownership of these parameters.