summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
commitcaa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch)
treebbfbe6ac84575766b4752e48960d12288a8b6c42 /sequencer.c
parente2af9e361b1d7452492baa073790b19292f9c038 (diff)
parenta46221e9adcf3deb88c4fc904859205bf87f784c (diff)
downloadgit-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.gz
Sync with 'maint'
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index baa031052e..ee4f8c6ed4 100644
--- 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
*/