Merge branch 'fc/completion'

diff --git a/sequencer.c b/sequencer.c
index baa031052e4e3f77bb6d4a257a5669ca5a5d617e..ee4f8c6ed4f040072b4d706c26d04a07f665c9f6 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -216,7 +216,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)
        if (msg) {
                fprintf(stderr, "%s\n", msg);
                /*
-                * A conflict has occured but the porcelain
+                * A conflict has occurred but the porcelain
                 * (typically rebase --interactive) wants to take care
                 * of the commit itself so remove CHERRY_PICK_HEAD
                 */