X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=wt-status.c;h=85f3fcb8a2f55b362268e00c5bb67434e38382b0;hb=e4d1afbcf2e39a997ae90befd629ee53e444c4c9;hp=63598ce40cdad4bc9acc5446d304f0512341f973;hpb=909beb860b98d51eeb26ff1f97bfad40ef7d5970;p=git.git

diff --git a/wt-status.c b/wt-status.c
index 63598ce40..85f3fcb8a 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -326,7 +326,7 @@ static void wt_status_collect_untracked(struct wt_status *s)
 	setup_standard_excludes(&dir);
 
 	fill_directory(&dir, NULL);
-	for(i = 0; i < dir.nr; i++) {
+	for (i = 0; i < dir.nr; i++) {
 		struct dir_entry *ent = dir.entries[i];
 		if (!cache_name_is_other(ent->name, ent->len))
 			continue;
@@ -561,8 +561,8 @@ void wt_status_print(struct wt_status *s)
 		color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
 	}
 
-	wt_status_print_unmerged(s);
 	wt_status_print_updated(s);
+	wt_status_print_unmerged(s);
 	wt_status_print_changed(s);
 	if (s->submodule_summary)
 		wt_status_print_submodule_summary(s);