Merge branch 'mv/sequencer-pick-error-diag'

diff --git a/sequencer.c b/sequencer.c
index 61fdb6805cd85b803f2675bef0619b04bd767314..cf8fbeb8d5ac2b6ca3b498f2115c02eeea22910a 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
                 */