commit - 7f838b36bf8c0d39dd81201613e45646c1579ef0
commit + 276262e805a4e606f787e74bf5435d50955437c4
blob - a9bc81f2143f3ba6103c518d3ec19c092c0b5016
blob + f2810cc167a8c04c76352024a0c2c3c679fdd103
--- got/got.c
+++ got/got.c
@@ -963,7 +963,7 @@ print_diff(void *arg, unsigned char status, const char
 	char *abspath = NULL;
 	struct stat sb;
 
-	if (status != GOT_STATUS_MODIFIY)
+	if (status != GOT_STATUS_MODIFY)
 		return NULL;
 
 	err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
blob - b8c74fd38cb835f3c4f177441861efc0fba475fb
blob + c28e21835670de5ae86292d65d24e0bf7139fada
--- include/got_worktree.h
+++ include/got_worktree.h
@@ -22,7 +22,7 @@ struct got_worktree;
 #define GOT_STATUS_EXISTS	'E'
 #define GOT_STATUS_UPDATE	'U'
 #define GOT_STATUS_DELETE	'D'
-#define GOT_STATUS_MODIFIY	'M'
+#define GOT_STATUS_MODIFY	'M'
 #define GOT_STATUS_CONFLICT	'C'
 #define GOT_STATUS_MERGE	'G'
 #define GOT_STATUS_MISSING	'!'
blob - 9a944a8f829e0a7732e518c02a5246ce3e4f0c2c
blob + e5d3988711eff141c95ff4ba833c68f65a8029c5
--- lib/worktree.c
+++ lib/worktree.c
@@ -839,20 +839,20 @@ get_file_status(unsigned char *status, struct got_file
 		flen = fread(fbuf, 1, sizeof(fbuf), f);
 		if (blen == 0) {
 			if (flen != 0)
-				*status = GOT_STATUS_MODIFIY;
+				*status = GOT_STATUS_MODIFY;
 			break;
 		} else if (flen == 0) {
 			if (blen != 0)
-				*status = GOT_STATUS_MODIFIY;
+				*status = GOT_STATUS_MODIFY;
 			break;
 		} else if (blen - hdrlen == flen) {
 			/* Skip blob object header first time around. */
 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
-				*status = GOT_STATUS_MODIFIY;
+				*status = GOT_STATUS_MODIFY;
 				break;
 			}
 		} else {
-			*status = GOT_STATUS_MODIFIY;
+			*status = GOT_STATUS_MODIFY;
 			break;
 		}
 		hdrlen = 0;
@@ -905,7 +905,7 @@ update_blob(struct got_worktree *worktree,
 	if (err)
 		goto done;
 
-	if (status == GOT_STATUS_MODIFIY)
+	if (status == GOT_STATUS_MODIFY)
 		err = merge_blob(worktree, fileindex, ie, ondisk_path, path,
 		    blob, repo, progress_cb, progress_arg);
 	else