prio-queue: priority queue of pointers to structs

diff --git a/sequencer.c b/sequencer.c
index aef5e8a0170c5b337f1aa3ac7a35be3b54957729..bad5077911667e11e522043ae09875489d4591c4 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -133,7 +133,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
                 */