git-merge: add --ff and --no-ff options

[git.git] / builtin-add.c

diff --git a/builtin-add.c b/builtin-add.c
index 866d19dd77e693a1ba77baa802c0e3f3ea85a305..0d7d0ce4209114245ca07842d7d5a4546e5b6cfd 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -95,7 +95,7 @@ static void update_callback(struct diff_queue_struct *q,
                const char *path = p->one->path;
                switch (p->status) {
                default:
-                       die("unexpacted diff status %c", p->status);
+                       die("unexpected diff status %c", p->status);
                case DIFF_STATUS_UNMERGED:
                case DIFF_STATUS_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED: