am: suppress apply errors when using 3-way

diff --git a/builtin-reflog.c b/builtin-reflog.c
index ff8b4f615b67358d31ccca78d7639ad0fe1ec78e..ddfdf5a3cbc79003dfbad14af8d1f047e3594aa6 100644 (file)
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -240,7 +240,7 @@ static int unreachable(struct expire_reflog_cb *cb, struct commit *commit, unsig
 static void mark_reachable(struct commit *commit, unsigned long expire_limit)
 {
        /*
-        * We need to compute if commit on either side of an reflog
+        * We need to compute whether the commit on either side of a reflog
         * entry is reachable from the tip of the ref for all entries.
         * Mark commits that are reachable from the tip down to the
         * time threshold first; we know a commit marked thusly is