t/t2021-checkout-last: "checkout -" should work after a rebase finishes
[gitweb.git] / sequencer.c
index f2c9d98f8f5cd3f3ff55444a8c76a3a7f00be9ec..ab6f8a722d1dfa8f9633d8c046aad26ef4d0404e 100644 (file)
@@ -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
                 */